update v1.0.7.9 R.C.

This is a Release Candidate. We are still testing.

resources/views/_partials/breadcrumbs.blade.php

@@ -1,7 +1,7 @@
-@if ($breadcrumbs)
+@if (isset($breadcrumbs))
 <ol class="breadcrumb breadcrumb-custom">
     <li class="text"> {!! Lang::get('lang.you_are_here') !!} :</li>
-    @foreach ($breadcrumbs as $breadcrumb)
+    @foreach($breadcrumbs as $breadcrumb)
     @if (!$breadcrumb->last)
     <li><a href="{{ $breadcrumb->url }}">{{ $breadcrumb->title }}</a></li>
     @else

resources/views/auth/password.blade.php

@@ -18,6 +18,14 @@
     @endforeach
 </div>
 @endif
+@if(Session::has('fails'))
+<div class="alert alert-danger alert-dismissable">
+    <i class="fa fa-ban"></i>
+    <b>{!! Lang::get('lang.alert') !!} !</b>
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    <li>{{Session::get('fails')}}</li>
+</div>
+@endif
 <p class="login-box-msg">{!! Lang::get('lang.enter_email_to_reset_password') !!}</p>
 <!-- form open -->
 <form role="form" method="POST" action="{{ url('/password/email') }}">

resources/views/auth/reset.blade.php

@@ -39,9 +39,7 @@
             <input type="password" class="form-control" name="password_confirmation" placeholder="{!! Lang::get('lang.confirm_password') !!}">
             <span class="glyphicon glyphicon-log-in form-control-feedback"></span>
         </div>
-
         <!-- Confirm password -->
-
         <div class="form-group">
             <div class="col-md-3"></div>
             <div class="col-md-3">
@@ -52,5 +50,4 @@
         </div>
     </form>
 </div>
-
-@stop
+@stop

resources/views/emails/mail.blade.php

@@ -0,0 +1 @@
+{!! $data !!}

resources/views/emails/notifications/admin.blade.php

@@ -10,7 +10,7 @@ foreach ($depts as $dept) {
 	$created  =  DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('created_at','LIKE','%'.$day1.'%')->count();
 	$closed  =  DB::table('tickets')->where('dept_id','=',$dept->id)->where('closed_at','LIKE','%'.$day1.'%')->count();
 	$inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->count();
-	$overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->get();
+	$overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('isanswered', '=', 0)->where('status', '=', 1)->get();
 	$i = 0;
 	foreach ($overdues as $overdue) {
 		$sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first();
@@ -72,20 +72,20 @@ foreach ($depts as $dept) {
        
 @foreach ($depts as $dept) 
    <?php 
-   // echo $dept->name;
-   $created  =  DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('created_at','LIKE','%'.$day1.'%')->count();
-   $closed  =  DB::table('tickets')->where('dept_id','=',$dept->id)->where('closed_at','LIKE','%'.$day1.'%')->count();
-   $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->count();
-   $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->get();
-   $i = 0;
-   foreach ($overdues as $overdue) {
-      $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first();
-      $ovdate = $overdue->created_at;
-      $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'<br/><br/>';
-      if(date('Y-m-d H:i:s') > $new_date){
-         $i++;
-      }
-   }
+    // echo $dept->name;
+    $created  =  DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('created_at','LIKE','%'.$day1.'%')->count();
+    $closed  =  DB::table('tickets')->where('dept_id','=',$dept->id)->where('closed_at','LIKE','%'.$day1.'%')->count();
+    $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->count();
+    $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('isanswered', '=', 0)->where('status', '=', 1)->get();
+    $i = 0;
+    foreach ($overdues as $overdue) {
+       $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first();
+       $ovdate = $overdue->created_at;
+       $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'<br/><br/>';
+       if(date('Y-m-d H:i:s') > $new_date){
+          $i++;
+       }
+    }
    // echo "created=".$created."<br/>";
    // echo "closed=".$closed."<br/>";
    // echo "inprogress=".$inprogress."<br/>";

resources/views/emails/notifications/agent.blade.php

@@ -11,7 +11,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('id','=',$user->primary_dpt)-
    $created  =  DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('created_at','LIKE','%'.$day1.'%')->count();
    $closed  =  DB::table('tickets')->where('dept_id','=',$dept->id)->where('closed_at','LIKE','%'.$day1.'%')->count();
    $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->count();
-   $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->get();
+   $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('isanswered', '=', 0)->where('status', '=', 1)->get();
    $i = 0;
    foreach ($overdues as $overdue) {
       $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first();

resources/views/emails/notifications/lead.blade.php

@@ -7,13 +7,13 @@ $day1  = Date($format,strtotime('-1 day'. $date));
 $depts = App\Model\helpdesk\Agent\Department::all();
 foreach ($depts as $dept) {
 	// echo $dept->name;
-	$created  =  DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('created_at','LIKE','%'.$day1.'%')->count();
+	$created  =  DB::table('tickets')->select('created_at')->where('dept_id', $dept->id)->where('team_id', $team_id)->where('created_at','LIKE','%'.$day1.'%')->count();
 
-	$closed  =  DB::table('tickets')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('closed_at','LIKE','%'.$day1.'%')->count();
+	$closed  =  DB::table('tickets')->where('dept_id', $dept->id)->where('team_id', $team_id)->where('closed_at','LIKE','%'.$day1.'%')->count();
 
-	$inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->count();
+	$inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id', $dept->id)->where('team_id', $team_id)->where('status', '=', 1)->count();
 
-	$overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->get();
+	$overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id', $dept->id)->where('team_id', $team_id)->where('isanswered', '=', 0)->where('status', '=', 1)->get();
 
 	$i = 0;
 	foreach ($overdues as $overdue) {

resources/views/emails/notifications/manager.blade.php

@@ -11,7 +11,7 @@ $closed  =  DB::table('tickets')->where('dept_id','=',$dept_id)->where('closed_a
 
 $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept_id)->where('status', '=', 1)->count();
 
-$overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept_id)->where('status', '=', 1)->get();
+$overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept_id)->where('status', '=', 1)->where('isanswered', '=', 0)->get();
 
 $i = 0;
 	foreach ($overdues as $overdue) {

resources/views/errors/db.blade.php

@@ -0,0 +1,15 @@
+@extends('themes.default1.client.layout.client')
+@section('content')  
+<div id="page" class="hfeed site">
+    <article class="hentry error404 text-center">
+        <h1 class="error-title"><i class="fa fa-frown-o text-info"></i><span class="visible-print text-danger">0</span></h1>
+        <h2 class="entry-title text-muted">{!! Lang::get('lang.error_establishing_connection_to_database') !!}</h2>
+    </article><!-- .hentry -->
+</div><!-- #page -->
+
+<script>
+    function goBack() {
+        window.history.back();
+    }
+</script>
+@stop

resources/views/errors/unauth.blade.php

@@ -0,0 +1,9 @@
+@extends('themes.default1.client.layout.client')
+@section('content')  
+<div id="page" class="hfeed site">
+    <article class="hentry error404 text-center">
+        <h1 class="error-title"><i class="fa fa-warning text-red"></i><span class="visible-print text-danger"></span></h1>
+        <h2 class="entry-title text-muted">{!! Lang::get('lang.unauthorized_access') !!}</h2>
+    </article><!-- .hentry -->
+</div><!-- #page -->
+@stop

resources/views/themes/default1/admin/helpdesk/agent/agents/create.blade.php

@@ -202,6 +202,11 @@ class="active"
             </div>
             @endwhile 
         </div>
+        <!-- Send email to user about registration password -->
+        <br/>
+        <div class="form-group">
+            <input type="checkbox" name="send_email" checked> &nbsp;<label> {{ Lang::get('lang.send_password_via_email')}}</label>
+        </div>
     </div>
     <div class="box-footer">
         {!! Form::submit(Lang::get('lang.submit'),['class'=>'form-group btn btn-primary'])!!}

resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php

@@ -32,7 +32,7 @@ class="active"
         <h2 class="box-title">{!! Lang::get('lang.list_of_agents') !!} </h2><a href="{{route('agents.create')}}" class="btn btn-primary pull-right">{!! Lang::get('lang.create_an_agent') !!}</a></div>
     <div class="box-body table-responsive">
         <?php
-        $user = App\User::where('role', '!=', 'user')->orderBy('id', 'ASC')->paginate(20);
+        $user = App\User::where('role', '!=', 'user')->orderBy('id', 'ASC')->paginate(10);
         ?>
         <!-- check whether success or not -->
         @if(Session::has('success'))
@@ -110,6 +110,9 @@ class="active"
             @endif
             @endforeach
         </table>
+        <div class="pull-right" style="margin-top : -10px; margin-bottom : -10px;">
+            {!! $user->links() !!}
+        </div>
     </div>
 </div>
 @stop

resources/views/themes/default1/admin/helpdesk/agent/departments/create.blade.php

@@ -103,6 +103,9 @@ class="active"
                 {!!Form::select('outgoing_email', ['' => Lang::get('lang.system_default'), Lang::get('lang.emails')=>$emails->lists('email_name','id')->toArray()],null,['class' => 'form-control select']) !!}
             </div>
         </div>
+        <div class="form-group">
+            <input type="checkbox" name="sys_department"> {{ Lang::get('lang.make-default-department')}}
+        </div>
     </div>
     <div class="box-footer">
         {!! Form::submit(Lang::get('lang.submit'),['class'=>'form-group btn btn-primary'])!!}    

resources/views/themes/default1/admin/helpdesk/agent/departments/edit.blade.php

@@ -103,12 +103,13 @@ class="active"
                 {!!Form::select('outgoing_email', ['' => Lang::get('lang.system_default'), Lang::get('lang.emails')=>$emails->lists('email_name','id')->toArray()],null,['class' => 'form-control select']) !!}
             </div>
         </div>
-
-    </div>
-    <div class="box-footer">
         <div class="form-group">
             <input type="checkbox" name="sys_department" @if($sys_department->department == $departments->id) checked disabled @endif> {{ Lang::get('lang.make-default-department')}}
         </div>
+    </div>
+
+    <div class="box-footer">
+
         {!! Form::submit(Lang::get('lang.update'),['class'=>'form-group btn btn-primary'])!!}    
     </div>
     {!!Form::close()!!}

resources/views/themes/default1/admin/helpdesk/emails/emails/create.blade.php

@@ -316,24 +316,32 @@ class="active"
                 var error = "Fetching Host is a required field";
                 error_list.push(error);
                 $("#fetching_host_error").addClass("has-error");
+            } else {
+                $("#fetching_host_error").removeClass("has-error");
             }
             // checking for validation of fetching port
             if (fetching_port == "") {
                 var error = "Fetching Port is a required field";
                 error_list.push(error);
                 $("#fetching_port_error").addClass("has-error");
+            } else {
+                $("#fetching_port_error").removeClass("has-error");
             }
             // checking for validation of mailbox protocol
             if (fetching_encryption == "") {
                 var error = "Fetching Encryption is a required field";
                 error_list.push(error);
                 $("#fetching_encryption_error").addClass("has-error");
+            } else {
+                $("#fetching_encryption_error").removeClass("has-error");
             }
             // checking for validation of mailbox protocol
             if (fetching_protocol == "") {
                 var error = "Fetching Protocol is a required field";
                 error_list.push(error);
                 $("#fetching_protocol_error").addClass("has-error");
+            } else {
+                $("#fetching_protocol_error").removeClass("has-error");
             }
 
         } else {
@@ -354,30 +362,42 @@ class="active"
                     var error = "Sending Host is a required field";
                     error_list.push(error);
                     $("#sending_host_error").addClass("has-error");
+                } else {
+                    $("#sending_host_error").removeClass("has-error");
                 }
                 // checking for validation of sending port
                 if (sending_port == "") {
                     var error = "Sending Port is a required field";
                     error_list.push(error);
                     $("#sending_port_error").addClass("has-error");
+                } else {
+                    $("#sending_port_error").removeClass("has-error");
                 }
                 // checking for validation of sending encryption
                 if (sending_encryption == "") {
                     var error = "Sending Encryption is a required field";
                     error_list.push(error);
                     $("#sending_encryption_error").addClass("has-error");
+                } else {
+                    $("#sending_encryption_error").removeClass("has-error");
                 }
                 // checking for validation of sending protocol
                 if (sending_protocol == "") {
                     var error = "Transfer Protocol is a required field";
                     error_list.push(error);
                     $("#sending_protocol_error").addClass("has-error");
+                } else {
+                    $("#sending_protocol_error").removeClass("has-error");
                 }
             } else if(sending_protocol == 'mail') {
                 $("#sending_host_error").val('');
                 $("#sending_port_error").val('');
                 $("#sending_encryption_error").val('');
                 $("#sending_protocol_error").val('');
+                $("#sending_host_error").removeClass("has-error");
+                $("#sending_port_error").removeClass("has-error");
+                $("#sending_encryption_error").removeClass("has-error");
+                $("#sending_protocol_error").removeClass("has-error");
             }
         } else {
             // checking for validation of fetching port
@@ -387,6 +407,11 @@ class="active"
                     error_list.push(error);
                     $("#sending_port_error").addClass("has-error");
                 }
+            } else {
+                $("#sending_host_error").removeClass("has-error");
+                $("#sending_port_error").removeClass("has-error");
+                $("#sending_encryption_error").removeClass("has-error");
+                $("#sending_protocol_error").removeClass("has-error");
             }
         }
         // executing error chatch
@@ -417,7 +442,6 @@ class="active"
             beforeSend: function() {
                 $('#alert').empty();
                 $("#click").trigger("click");
-
             },
             success: function(response) {
                 if (response == 1) {

resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php

@@ -351,24 +351,32 @@ class="active"
                 var error = "Fetching Host is a required field";
                 error_list.push(error);
                 $("#fetching_host_error").addClass("has-error");
+            } else {
+                $("#fetching_host_error").removeClass("has-error");
             }
             // checking for validation of fetching port
             if (fetching_port == "") {
                 var error = "Fetching Port is a required field";
                 error_list.push(error);
                 $("#fetching_port_error").addClass("has-error");
+            } else {
+                $("#fetching_port_error").removeClass("has-error");
             }
             // checking for validation of mailbox protocol
             if (fetching_encryption == "") {
                 var error = "Fetching Encryption is a required field";
                 error_list.push(error);
                 $("#fetching_encryption_error").addClass("has-error");
+            } else {
+                $("#fetching_encryption_error").removeClass("has-error");
             }
             // checking for validation of mailbox protocol
             if (fetching_protocol == "") {
                 var error = "Fetching Protocol is a required field";
                 error_list.push(error);
                 $("#fetching_protocol_error").addClass("has-error");
+            } else {
+                $("#fetching_protocol_error").removeClass("has-error");
             }
         } else {
             // checking for validation of fetching port
@@ -378,6 +386,8 @@ class="active"
                     error_list.push(error);
                     $("#fetching_port_error").addClass("has-error");
                 }
+            } else {
+                $("#fetching_port_error").removeClass("has-error");
             }
         }
         // checking for validation of sending status
@@ -389,30 +399,42 @@ class="active"
                     var error = "Sending Host is a required field";
                     error_list.push(error);
                     $("#sending_host_error").addClass("has-error");
+                } else {
+                    $("#sending_host_error").removeClass("has-error");
                 }
                 // checking for validation of sending port
                 if (sending_port == "") {
                     var error = "Sending Port is a required field";
                     error_list.push(error);
                     $("#sending_port_error").addClass("has-error");
+                } else {
+                    $("#sending_port_error").removeClass("has-error");
                 }
                 // checking for validation of sending encryption
                 if (sending_encryption == "") {
                     var error = "Sending Encryption is a required field";
                     error_list.push(error);
                     $("#sending_encryption_error").addClass("has-error");
+                } else {
+                    $("#sending_encryption_error").removeClass("has-error");
                 }
                 // checking for validation of sending protocol
                 if (sending_protocol == "") {
                     var error = "Transfer Protocol is a required field";
                     error_list.push(error);
                     $("#sending_protocol_error").addClass("has-error");
+                } else {
+                    $("#sending_protocol_error").removeClass("has-error");
                 }
             } else if(sending_protocol == 'mail') {
                 $("#sending_host_error").val('');
                 $("#sending_port_error").val('');
                 $("#sending_encryption_error").val('');
                 $("#sending_protocol_error").val('');
+                $("#sending_host_error").removeClass("has-error");
+                $("#sending_port_error").removeClass("has-error");
+                $("#sending_encryption_error").removeClass("has-error");
+                $("#sending_protocol_error").removeClass("has-error");
             }
         } else {
             // checking for validation of fetching port
@@ -422,6 +444,11 @@ class="active"
                     error_list.push(error);
                     $("#sending_port_error").addClass("has-error");
                 }
+            } else {
+                $("#sending_host_error").removeClass("has-error");
+                $("#sending_port_error").removeClass("has-error");
+                $("#sending_encryption_error").removeClass("has-error");
+                $("#sending_protocol_error").removeClass("has-error");
             }
         }
         // executing error chatch
@@ -439,7 +466,7 @@ class="active"
                 return false;
             }
         }
-// Ajax communicating to backend for further Checking/Saving the details
+        // Ajax communicating to backend for further Checking/Saving the details
         $.ajax({
             type: "POST",
             url: "{!! route('validating.email.settings.update', $emails->id ) !!}",

resources/views/themes/default1/admin/helpdesk/manage/form/form.blade.php

@@ -112,7 +112,7 @@ class="active"
             e.preventDefault();
             if (x < max_fields) {
                 x++;
-                $(wrapper).append('<tr><td><input type="text" class="form-control" name="label[]"></td><td><input type="text" class="form-control" name="name[]"></td><td><select name="type[]" class="form-control"><option>text</option><option>email</option><option>password</option><option>textarea</option><option>select</option><option>radio</option><option>checkbox</option><option>submit</option></select></td><td><textarea name="value[]" class="form-control"></textarea></td><td>{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required[' + x + '][]" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}&nbsp;&nbsp;<input type=radio name="required[' + x + '][]" value=0></td><td><button type="button" class="remove_field btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp {!! Lang::get("lang.remove") !!}</button></td></tr>');
+                $(wrapper).append('<tr><td><input type="text" class="form-control" name="label[]"></td><td><input type="text" class="form-control" name="name[]"></td><td><select name="type[]" class="form-control"><option>text</option><option>email</option><option>password</option><option>textarea</option><option>select</option><option>radio</option><option>checkbox</option></select></td><td><textarea name="value[]" class="form-control"></textarea></td><td>{!! Lang::get("lang.yes") !!}&nbsp;&nbsp;<input type=radio name="required[' + x + '][]" value=1 checked>&nbsp;&nbsp;{!! Lang::get("lang.no") !!}&nbsp;&nbsp;<input type=radio name="required[' + x + '][]" value=0></td><td><button type="button" class="remove_field btn btn-danger"><i class="fa fa-trash-o"></i>&nbsp {!! Lang::get("lang.remove") !!}</button></td></tr>');
             }
         });
         $(wrapper).on("click", ".remove_field", function(e)

resources/views/themes/default1/admin/helpdesk/manage/form/preview.blade.php

@@ -50,6 +50,7 @@ class="active"
         <?php
         $i = $id->id;
         $form_datas = App\Model\helpdesk\Form\Fields::where('forms_id', '=', $i)->get();
+//        dd($form_datas);
         foreach ($form_datas as $form_data) {
             if ($form_data->type == "select") {
                 $form_fields = explode(',', $form_data->value);
@@ -63,21 +64,20 @@ class="active"
                 $vals = explode(',', $type2);
                 echo '<br/><label>' . ucfirst($form_data->label) . '</label><br/>';
                 foreach ($vals as $val) {
-                    echo '<input type="' . $form_data->type . '" name="' . $form_data->name . '"> ' . $form_data->name . '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+                    echo '<input type="' . $form_data->type . '" name="' . $form_data->name . '"> ' . $val . '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
                 }
             } elseif ($form_data->type == "textarea") {
                 $type3 = $form_data->value;
-                $v = explode(',', $type3);
-                echo '<label>' . $form_data->label . '</label></br><textarea rows="' . $v[0] . '" cols="' . $v[1] . '"></textarea></br></br>';
+                echo '<label>' . $form_data->label . '</label></br><textarea name="'.$form_data->name.'" class="form-control" style="height:15%;"></textarea>';
             } elseif ($form_data->type == "checkbox") {
                 $type4 = $form_data->value;
                 $checks = explode(',', $type4);
-                echo '<label>' . ucfirst($form_data->label) . '</label><br/>';
+                echo '<br/><br/><label>' . ucfirst($form_data->label) . '</label><br/>';
                 foreach ($checks as $check) {
                     echo '<input type="' . $form_data->type . '" name="' . $form_data->name . '">&nbsp&nbsp' . $check;
                 }
             } else {
-                echo '<label>' . ucfirst($form_data->label) . '</label><input type="' . $form_data->type . '" class="form-control"   name="' . $form_data->name . '" /></br></br>';
+                echo '<label>' . ucfirst($form_data->label) . '</label><input type="' . $form_data->type . '" class="form-control"   name="' . $form_data->name . '" />';
             }
         }
         ?>             

resources/views/themes/default1/admin/helpdesk/manage/workflow/index.blade.php

@@ -70,6 +70,11 @@ class="active"
     <!-- /.col -->
 </div>
 <script>
+    function confirm_delete() {
+        return confirm('are you sure?');
+    }
+
+
     $(function() {
         $("#example1").DataTable();
         $('#example2').DataTable({
@@ -81,5 +86,6 @@ class="active"
             "autoWidth": false
         });
     });
+
 </script>
 @stop

resources/views/themes/default1/admin/helpdesk/settings/alert.blade.php

@@ -104,20 +104,5 @@ class="active"
             </div><!-- /.box-body -->
         </div><!-- /.box -->
     </div><!--/.col (left) -->
-    <div class="col-md-6">
-        <div class="box box-primary">
-            <div class="box-header with-border">
-                <h3 class="box-title">{{Lang::get('lang.system_error_reports')}}</h3>
-            </div>
-            <!-- /.box-header -->
-            <div class="box-body">
-                <!-- System Errors (enabled by default) -->
-                <div class="form-group">
-                    {!! Form::checkbox('system_error',1) !!}
-                    {!! Form::label('system_error',Lang::get('lang.Send_app_crash_reports_to_help_Ladybird_improve_Faveo')) !!}
-                </div>
-            </div>
-        </div>
-    </div>
 </div>
 @stop

resources/views/themes/default1/admin/helpdesk/settings/checkupdate.blade.php

@@ -1,32 +0,0 @@
-@extends('themes.default1.admin.layout.admin')
-@section('update')
-class="active"
-@stop
-@section('PageHeader')
-<h1>{{ Lang::get('lang.update-version')}}</h1>
-@stop
-@section('content')
-
-<div class="box box-primary">
-	<div class="box-header">
-		<h3 class="box-title">Check for Update</h3>
-	</div>
-	 
-	<div class="box-body">
-	@if(Session::has('info'))
-        <div class="alert alert-info alert-dismissable">
-            <i class="fa  fa-info-circle"></i>
-            <b>Info!</b>
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {!!Session::get('info')!!}
-        </div>
-        @endif
-		Click to check Update
-                <a href="{!! URL::route('version-check') !!}" class="btn btn-primary">Check</a>
-	</div>
-	<div class="box-footer">
-		
-	</div>
-</div>
-
-@stop

resources/views/themes/default1/admin/helpdesk/settings/company.blade.php

@@ -118,7 +118,7 @@ class="active"
                 <?php $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first(); ?>
                 @if($companys->logo != null)
                 <div class="col-md-2 image" data-content="{{Lang::get('lang.click-delete')}}">
-                    <img src="{{asset('lb-faveo/media/company')}}{{'/'}}{{$company->logo}}" alt="User Image" id="company-logo" width="100px" style="border:1px solid #DCD1D1" />
+                    <img src="{{asset('uploads/company')}}{{'/'}}{{$company->logo}}" alt="User Image" id="company-logo" width="100px" style="border:1px solid #DCD1D1" />
                 </div>
                 @endif
             </div>
@@ -164,7 +164,7 @@ class="active"
             var src = $('#company-logo').attr('src').split('/');
             var file = src[src.length - 1];
 
-            var path = "lb-faveo/media/company/" + file;
+            var path = "uploads/company/" + file;
             // alert(path); 
             $.ajax({
                 type: "GET",

resources/views/themes/default1/admin/helpdesk/settings/system.blade.php

@@ -95,7 +95,7 @@ class="active"
                 <div class="form-group {{ $errors->has('time_zone') ? 'has-error' : '' }}">
                     {!! Form::label('time_zone',Lang::get('lang.timezone')) !!}
                     {!! $errors->first('time_zone', '<spam class="help-block">:message</spam>') !!}
-                    {!!Form::select('time_zone',[''=>Lang::get('lang.select_a_time_zone'),'Time Zones'=>$timezones->lists('name','id')->toArray()],null,['class'=>'form-control']) !!}
+                    {!!Form::select('time_zone',['Time Zones'=>$timezones->lists('name','id')->toArray()],null,['class'=>'form-control']) !!}
                 </div>
             </div>
         </div>
@@ -105,15 +105,15 @@ class="active"
                 <div class="form-group {{ $errors->has('date_time_format') ? 'has-error' : '' }}">
                     {!! Form::label('date_time_format',Lang::get('lang.date_time')) !!}
                     {!! $errors->first('date_time_format', '<spam class="help-block">:message</spam>') !!}
-                    {!! Form::select('date_time_format',[''=>Lang::get('lang.select_a_date_time_format'),'Date Time Formats'=>$date_time->lists('format','id')->toArray()],null,['class' => 'form-control']) !!}
+                    {!! Form::select('date_time_format',['Date Time Formats'=>$date_time->lists('format','id')->toArray()],null,['class' => 'form-control']) !!}
                 </div>
             </div>
            
-             <div class="col-md-4">
+            <div class="col-md-4">
                 <div class="form-group">
                     {!! Form::label('status',Lang::get('lang.status')) !!}
                     <div class="row">
-                        <div class="col-xs-6">
+                        <div class="col-xs-5">
                             {!! Form::radio('status','1',true) !!} {{Lang::get('lang.online')}}
                         </div>
                         <div class="col-xs-6">
@@ -122,14 +122,37 @@ class="active"
                     </div>
                 </div>
             </div>
-            <!-- Default Department:	Dropdown From  Department table: required  -->
-            <!-- <div class="col-md-4">
-                <div class="form-group {{ $errors->has('department') ? 'has-error' : '' }}">
-                    {!! Form::label('department',Lang::get('lang.default_department')) !!}
-                    {!! $errors->first('department', '<spam class="help-block">:message</spam>') !!}
-                    {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),'Department'=>$departments->lists('name','id')->toArray()],null,['class'=>'form-control']) !!}
+            <div class="col-md-3">
+                <div class="form-group">
+                    {!! Form::label('user_set_ticket_status',Lang::get('lang.user_set_ticket_status')) !!}
+                    <div class="row">
+                        <div class="col-xs-5">
+                            <input type="radio" name="user_set_ticket_status" value="0" @if($common_setting->status == '0')checked="true" @endif>{{Lang::get('lang.no')}}
+                        </div>
+                        <div class="col-xs-6">
+                            <input type="radio" name="user_set_ticket_status" value="1" @if($common_setting->status == '1')checked="true" @endif>{{Lang::get('lang.yes')}}
+                        </div>
+                    </div>
                 </div>
-            </div> -->
+            </div>
+        </div>
+        <div class="row">    
+            <div class="col-md-5">
+                <div class="form-group">
+                    {!! Form::label('status',Lang::get('lang.rtl')) !!}
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <?php
+                            $rtl = App\Model\helpdesk\Settings\CommonSettings::where('option_name', '=', 'enable_rtl')->first();
+                            ?>
+                            <input type="checkbox" name="enable_rtl" @if($rtl->option_value == 1) checked @endif> {{Lang::get('lang.enable')}}
+                        </div>
+                        <div class="col-xs-12">
+                            <code>{!! Lang::get('lang.the_rtl_support_is_only_applicable_to_the_outgoing_mails') !!}</code>
+                        </div>
+                    </div>
+                </div>
+            </div>
             
         </div>
     </div>

resources/views/themes/default1/admin/helpdesk/tickets/ticket.blade.php

@@ -282,7 +282,7 @@
                                                     <td class="mailbox-star"><a href="#"><i class="fa fa-star text-yellow"></i></a></td>
                                                     @foreach($threads as $thread)
                                                     <td class="mailbox-name"><a href="timeline.html">{{$thread->ticket_subject}}</a></td>
-                                                   
+
                                                     <td class="mailbox-Id">{{$thread->ticket_id}}</td>
                                                      @endforeach
                                                     <td class="mailbox-last-reply">client</td>
@@ -343,7 +343,7 @@
                                 <div class="box-footer no-padding">
                                     <div class="mailbox-controls">
                                         <!-- Check all button -->
-                                        <button class="btn btn-default btn-sm checkbox-toggle"><i class="fa fa-square-o"></i></button>                    
+                                        <button class="btn btn-default btn-sm checkbox-toggle"><i class="fa fa-square-o"></i></button>
                                         <div class="btn-group">
                                             <button class="btn btn-default btn-sm"><i class="fa fa-trash-o"></i></button>
                                             <button class="btn btn-default btn-sm"><i class="fa fa-reply"></i></button>
@@ -372,8 +372,8 @@
             </footer>
         </div><!-- ./wrapper -->
 
-        <!-- jQuery 2.1.3 -->
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+        <!-- jQuery 2.1.1 -->
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
         <!-- Bootstrap 3.3.2 JS -->
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
         <!-- Slimscroll -->

resources/views/themes/default1/admin/layout/admin.blade.php

@@ -5,35 +5,33 @@
         <title>Faveo | HELP DESK</title>
         <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
         <!-- faveo favicon -->
-        <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
+        <link href="{{asset("lb-faveo/media/images/favicon.ico")}}" rel="shortcut icon"> 
         <!-- Bootstrap 3.3.2 -->
         <link href="{{asset("lb-faveo/css/bootstrap.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- Font Awesome Icons -->
-        {{-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" /> --}}
         <link href="{{asset("lb-faveo/css/font-awesome.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- Ionicons -->
-        {{-- <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css"> --}}
-        <link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet">
-        <!-- fullCalendar 2.2.5-->
+        <link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet" type="text/css" >
         <!-- Theme style -->
         <link href="{{asset("lb-faveo/css/AdminLTE.css")}}" rel="stylesheet" type="text/css" />
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-             folder instead of downloading all of them to reduce the load. -->
+        <!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
         <link href="{{asset("lb-faveo/css/skins/_all-skins.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- iCheck -->
         <link href="{{asset("lb-faveo/plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <link href="{{asset("lb-faveo/css/tabby.css")}}" type="text/css" rel="stylesheet">
+        <!-- This controlls the top tabs -->
+        <link href="{{asset("lb-faveo/css/tabby.css")}}" rel="stylesheet" type="text/css" >
+        <!-- In app notification style -->
         <link href="{{asset('css/notification-style.css')}}" rel="stylesheet" type="text/css">
+        
         <link href="{{asset("lb-faveo/css/jquerysctipttop.css")}}" rel="stylesheet" type="text/css">
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        
         <link  href="{{asset("lb-faveo/css/editor.css")}}" rel="stylesheet" type="text/css">
         <script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" type="text/javascript"></script>
         <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
-        <link href="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.css")}}" rel="stylesheet">    
-        {{-- // <script src="https://code.jquery.com/jquery-2.1.4.js" type="text/javascript"></script> --}}
+        <link href="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.css")}}" rel="stylesheet" type="text/css" >
+        
         <script src="{{asset("lb-faveo/js/jquery-2.1.4.js")}}" type="text/javascript"></script>
-        {{-- // <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> --}}
+        
         <script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
         <!--[if lt IE 9]>
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -78,7 +76,7 @@
                         <ul class="nav navbar-nav navbar-left">
                             @if($replacetop==0)
                             <li @yield('settings')><a href="{!! url('dashboard') !!}">{!! Lang::get('lang.agent_panel') !!}</a></li>
-                            @else 
+                            @else
                             <?php \Event::fire('service.desk.admin.topbar', array()); ?>
                             @endif
                         </ul>
@@ -88,6 +86,7 @@
 
                         <ul class="nav navbar-nav navbar-right">
                             <li><a href="{{url('admin')}}">{!! Lang::get('lang.admin_panel') !!}</a></li>
+                            @include('themes.default1.update.notification')
                             <!-- User Account: style can be found in dropdown.less -->
                             <li class="dropdown notifications-menu" id="myDropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="myFunction()">
@@ -159,7 +158,7 @@
                                 <img src="{{Auth::user()->profile_pic}}"class="user-image" alt="User Image"/>
 
                                 <span class="hidden-xs">{!! Auth::user()->first_name." ".Auth::user()->last_name !!}</span>
-                                @endif          
+                                @endif
                             </a>
                             <ul class="dropdown-menu">
                                 <!-- User image -->
@@ -317,27 +316,6 @@
                                 <span>{!! Lang::get('lang.api') !!}</span>
                             </a>
                         </li>
-                        <li class="header">{!! Lang::get('lang.Updates') !!}</li>
-                        <li @yield('update')>
-                        <?php
-                        $update = App\Model\helpdesk\Utility\Version_Check::where('id', '=', 1)->first();
-                        if ($update->current_version == $update->new_version) {
-                            ?>
-                                 <a href="{!! URL::route('checkupdate') !!}" id="checkUpdate">
-                                    <span>{!! Lang::get('lang.no_new_updates') !!}!</span><br/>
-                                    <br/>
-                                    <i class="fa fa-inbox"></i> <span>{!! Lang::get('lang.check_for_updates') !!}.</span>
-                                    <img  id="gif-update" src="{{asset("lb-faveo/media/images/gifloader.gif")}}" style="width:12%; height:12%; margin-bottom:5%;margin-left:10%;display:none">
-
-                                    <small class="label pull-right bg-green"></small>
-                                </a>
-                            <?php } elseif ($update->current_version < $update->new_version) { ?>
-                                <a>
-                                    <i class="fa fa-inbox"></i> <span>Version {!! $update->new_version !!}  is Available</span>
-                                    <small class="label pull-right bg-green"></small>
-                                </a>
-                            <?php } ?>
-                        </li>
                         @endif
                         <?php \Event::fire('service.desk.admin.sidebar', array()); ?>
                     </ul>
@@ -359,7 +337,7 @@
 
                 <!-- Main content -->
                 <section class="content">
-                    @include('themes.default1.update.notification')
+
                     @yield('content')
                 </section><!-- /.content -->
                 <!-- /.content-wrapper -->
@@ -375,33 +353,34 @@
             </footer>
         </div><!-- ./wrapper -->
         <!-- jQuery 2.1.3 -->
-        <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}"></script>
+        <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}" type="text/javascript"></script>
         <!-- Bootstrap 3.3.2 JS -->
         <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
         <!-- Slimscroll -->
         <script src="{{asset("lb-faveo/plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
         <!-- FastClick -->
-        <script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}"></script>
+        <script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}" type="text/javascript"></script>
         <!-- AdminLTE App -->
         <script src="{{asset("lb-faveo/js/app.min.js")}}" type="text/javascript"></script>
-        <!-- AdminLTE for demo purposes -->
-        {{-- // <script src="{{asset("dist/js/demo.js")}}" type="text/javascript"></script> --}}
-    <!-- iCheck -->
-    <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
-    <script src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}" type="text/javascript"></script>
-    <script src="{{asset("lb-faveo/plugins/datatables/jquery.dataTables.js")}}" type="text/javascript"></script>
-    <!-- Page Script -->
-    <script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
-    {{-- // <script type="text/javascript" src="https://cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js"></script> --}}
-    <script src="{{asset("lb-faveo/js/jquery.dataTables1.10.10.min.js")}}"  type="text/javascript"></script>
-    <script src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}"  type="text/javascript"></script>
-    <script>
+        <!-- iCheck -->
+        <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
+        
+        <script src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}" type="text/javascript"></script>
+        
+        <script src="{{asset("lb-faveo/plugins/datatables/jquery.dataTables.js")}}" type="text/javascript"></script>
+        <!-- Page Script -->
+        <script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
+
+        <script src="{{asset("lb-faveo/js/jquery.dataTables1.10.10.min.js")}}"  type="text/javascript"></script>
+        
+        <script src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}"  type="text/javascript"></script>
+<script>
 $(function () {
 //Add text editor
     $("textarea").wysihtml5();
 });
 // $(function(){
-//     $("#checkUpdate").on('click',function(){        
+//     $("#checkUpdate").on('click',function(){
 //             $.ajax({
 //                 type: "GET",
 //                 url: "{!! URL::route('version-check') !!}",
@@ -479,11 +458,9 @@ $(function () {
                         }
                     });
         });</script>
- <!-- // <script src="../plugins/jQuery/jQuery-2.1.3.min.js"></script> -->
+    
     <script src="{{asset("lb-faveo/js/tabby.js")}}"></script>
-     <!-- // <script src="{{asset("dist/js/editor.js")}}"></script> -->
     <!-- CK Editor -->
-    <!-- // <script src="{{asset("//cdn.ckeditor.com/4.4.3/standard/ckeditor.js")}}"></script> -->
     <script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
 
     @yield('FooterInclude')

resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php

@@ -17,7 +17,24 @@ class="active"
 @stop
 
 @section('content')
-
+        <!-- check whether success or not -->
+        {{-- Success message --}}
+        @if(Session::has('success'))
+        <div class="alert alert-success alert-dismissable">
+            <i class="fa  fa-check-circle"></i>
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            {{Session::get('success')}}
+        </div>
+        @endif
+        {{-- failure message --}}
+        @if(Session::has('fails'))
+        <div class="alert alert-danger alert-dismissable">
+            <i class="fa fa-ban"></i>
+            <b>{!! Lang::get('lang.alert') !!}!</b>
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            {{Session::get('fails')}}
+        </div>
+        @endif
 <link type="text/css" href="{{asset("lb-faveo/css/bootstrap-datetimepicker4.7.14.min.css")}}" rel="stylesheet">
 {{-- <script src="{{asset("lb-faveo/dist/js/bootstrap-datetimepicker4.7.14.min.js")}}" type="text/javascript"></script> --}}
 <div class="row">
@@ -169,17 +186,18 @@ class="active"
                         {!! Form::label('filter', 'Filter:',['class' => 'lead']) !!}<br>
                         <input type="submit" class="btn btn-primary">
                     </div>
-                    <div class="col-sm-7">
+                </div>
+                <div class="row">
+                    <div class="col-sm-1"></div>
+                    <div class="col-sm-2" style="margin-bottom:-20px;">
                         <label class="lead">{!! Lang::get('lang.Legend') !!}:</label>
-                        <div class="row">
-                            <style>
-                                #legend-holder { border: 1px solid #ccc; float: left; width: 25px; height: 25px; margin: 1px; }
-                            </style>
-                            <div class="col-md-4"><span id="legend-holder" style="background-color: #6C96DF;"></span>&nbsp; <span class="lead"> <span id="total-created-tickets" ></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!}</span></div> 
-                            <div class="col-md-4"><span id="legend-holder" style="background-color: #6DC5B2;"></span>&nbsp; <span class="lead"> <span id="total-reopen-tickets" class="lead"></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.reopen') !!}</span></div> 
-                            <div class="col-md-4"><span id="legend-holder" style="background-color: #E3B870;"></span>&nbsp; <span class="lead"> <span id="total-closed-tickets" class="lead"></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.closed') !!}</span></div> 
-                        </div>
                     </div>
+                        <style>
+                            #legend-holder { border: 1px solid #ccc; float: left; width: 25px; height: 25px; margin: 1px; }
+                        </style>
+                        <div class="col-md-3"><span id="legend-holder" style="background-color: #6C96DF;"></span>&nbsp; <span class="lead"> <span id="total-created-tickets" ></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!}</span></div> 
+                        <div class="col-md-3"><span id="legend-holder" style="background-color: #6DC5B2;"></span>&nbsp; <span class="lead"> <span id="total-reopen-tickets" class="lead"></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.reopen') !!}</span></div> 
+                        <div class="col-md-3"><span id="legend-holder" style="background-color: #E3B870;"></span>&nbsp; <span class="lead"> <span id="total-closed-tickets" class="lead"></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.closed') !!}</span></div> 
                 </div>
             </div>
         </form>

resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php

@@ -21,16 +21,15 @@ class="active"
 $date_time_format = UTC::getDateTimeFormat();
 $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
     if(Auth::user()->role == 'agent') {
-        
-        $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','=','2')->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
+        $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','=','2')->where('status','=','3')->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
     } else {
-        $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','=','2')->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
+        $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','=','2')->where('status','=','3')->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
     }   
 ?>
 <!-- Main content -->
 <div class="box box-primary">
      <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.open') !!} </h3> <small id="title_refresh">{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!}</small>
+        <h3 class="box-title">{!! $dept->name !!} / {!! Lang::get('lang.closed') !!} </h3> <small id="title_refresh">{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!}</small>
         <div class="box-tools pull-right">
         <div class="has-feedback">
 
@@ -63,6 +62,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
             <input type="submit" class="submit btn btn-default text-blue btn-sm" id="close" name="submit" value="{!! Lang::get('lang.open') !!}">
             <!-- <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
  -->        </div>
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
         <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
         <!-- table -->
@@ -76,37 +76,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
                     Lang::get('lang.assigned_to'),
                     Lang::get('lang.last_activity'))
                 ->setUrl(route('get.dept.close', $dept->id))
-                ->setOptions('aoColumnDefs',array(
-        array(
-            'render' => "function ( data, type, row ) {
-                    var t = row[6].split(/[- :,/ :,. /]/);
-                    var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-                    <!--  -->
-                    var dtf= '$date_time_format';
-                    if(dtf==1) {
-                        dtf = 'D/MMM/YYYY hh:mm:ss A';
-                    } else if(dtf==2) {
-                        dtf = 'D MMM, YYYY hh:mm:ss A';
-                    } else if(dtf==3) {
-                        dtf = 'D-MMM-YYYY hh:mm:ss A';
-                    } else if(dtf==4) {
-                        dtf = 'MMM/D/YYYY hh:mm:ss A';
-                    } else if(dtf==5) {
-                        dtf = 'MMM D, YYYY hh:mm:ss A';
-                    } else if(dtf==6) {
-                        dtf = 'MMM-D-YYYY hh:mm:ss A';
-                    } else if(dtf==7) {
-                        dtf = 'YYYY/MMM/D hh:mm:ss A';
-                    } else if(dtf==8) {
-                        dtf = 'YYYY, MMM D hh:mm:ss A';
-                    } else if(dtf==9) {
-                        dtf = 'YYYY-MMM-D hh:mm:ss A';
-                    }
-                    return  moment(d).format(dtf);
-                    <!-- //return d; -->
-                }", 
-            'aTargets' => array(6))
-        ))
+                
                 ->setOrder(array(6=>'desc'))  
                 ->setClass('table table-hover table-bordered table-striped')
                 ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php

@@ -21,17 +21,17 @@ class="active"
 <?php
 $date_time_format = UTC::getDateTimeFormat();
 $dept = App\Model\helpdesk\Agent\Department::where('name', '=', $id)->first();
-if (Auth::user()->role == 'agent') {
-        
-    $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', '1')->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20);
+if (Auth::user()->role == 'agent') {    
+    $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', '1')->where('assigned_to', '>', 0)
+            ->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count();
 } else {
-        $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', '1')->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20);
+    $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', '1')->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->count();
 }
 ?>
 <!-- Main content -->
 <div class="box box-primary">
      <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.inprogress') !!} </h3> <small id="title_refresh">{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!}</small>
+        <h3 class="box-title">{!! $dept->name !!} / {!! Lang::get('lang.assigned') !!} </h3> <small id="title_refresh">{!! $tickets !!} {!! Lang::get('lang.tickets') !!}</small>
         <div class="box-tools pull-right">
         <div class="has-feedback">
 
@@ -64,6 +64,7 @@ if (Auth::user()->role == 'agent') {
             <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
             <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         </div>
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
         <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
         <!-- table -->
@@ -77,37 +78,7 @@ if (Auth::user()->role == 'agent') {
                     Lang::get('lang.assigned_to'),
                     Lang::get('lang.last_activity'))
                 ->setUrl(route('get.dept.inprocess', $dept->id))
-                ->setOptions('aoColumnDefs',array(
-        array(
-            'render' => "function ( data, type, row ) {
-                    var t = row[6].split(/[- :,/ :,. /]/);
-                    var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-                    <!--  -->
-                    var dtf= '$date_time_format';
-                    if(dtf==1) {
-                        dtf = 'D/MMM/YYYY hh:mm:ss A';
-                    } else if(dtf==2) {
-                        dtf = 'D MMM, YYYY hh:mm:ss A';
-                    } else if(dtf==3) {
-                        dtf = 'D-MMM-YYYY hh:mm:ss A';
-                    } else if(dtf==4) {
-                        dtf = 'MMM/D/YYYY hh:mm:ss A';
-                    } else if(dtf==5) {
-                        dtf = 'MMM D, YYYY hh:mm:ss A';
-                    } else if(dtf==6) {
-                        dtf = 'MMM-D-YYYY hh:mm:ss A';
-                    } else if(dtf==7) {
-                        dtf = 'YYYY/MMM/D hh:mm:ss A';
-                    } else if(dtf==8) {
-                        dtf = 'YYYY, MMM D hh:mm:ss A';
-                    } else if(dtf==9) {
-                        dtf = 'YYYY-MMM-D hh:mm:ss A';
-                    }
-                    return  moment(d).format(dtf);
-                    <!-- //return d; -->
-                }", 
-            'aTargets' => array(6))
-        ))
+                
                 ->setOrder(array(6=>'desc'))
                 ->setClass('table table-hover table-bordered table-striped')
                 ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php

@@ -20,19 +20,19 @@ class="active"
 <?php
 $date_time_format = UTC::getDateTimeFormat();
 $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
-    if(Auth::user()->role == 'agent') {
-        $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','=','1')->where('isanswered','=', 0)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
-    } else {
-        $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','=','1')->where('isanswered','=', 0)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
-    }   
+if (Auth::user()->role == 'admin') {
+    $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->count();
+} else {
+    $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first();
+    $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->count();
+}
 ?>
 <!-- Main content -->
 <div class="box box-primary">
      <div class="box-header with-border">
-        <h3 class="box-title">{!! Lang::get('lang.open') !!} </h3> <small id="title_refresh">{!! $tickets->total() !!} {!! Lang::get('lang.tickets') !!}</small>
+        <h3 class="box-title">{!! $dept->name !!} / {!! Lang::get('lang.open') !!} <small id="title_refresh">{!! $tickets !!} {!! Lang::get('lang.tickets') !!}</small></h3>
         <div class="box-tools pull-right">
         <div class="has-feedback">
-
             </div>
         </div>
     </div><!-- /.box-header -->
@@ -62,6 +62,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
             <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
             <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         </div>
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
         <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
         <!-- table -->
@@ -75,37 +76,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
                     Lang::get('lang.assigned_to'),
                     Lang::get('lang.last_activity'))
                 ->setUrl(route('get.dept.open', $dept->id))
-                ->setOptions('aoColumnDefs',array(
-        array(
-            'render' => "function ( data, type, row ) {
-                    var t = row[6].split(/[- :,/ :,. /]/);
-                    var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-                    <!--  -->
-                    var dtf= '$date_time_format';
-                    if(dtf==1) {
-                        dtf = 'D/MMM/YYYY hh:mm:ss A';
-                    } else if(dtf==2) {
-                        dtf = 'D MMM, YYYY hh:mm:ss A';
-                    } else if(dtf==3) {
-                        dtf = 'D-MMM-YYYY hh:mm:ss A';
-                    } else if(dtf==4) {
-                        dtf = 'MMM/D/YYYY hh:mm:ss A';
-                    } else if(dtf==5) {
-                        dtf = 'MMM D, YYYY hh:mm:ss A';
-                    } else if(dtf==6) {
-                        dtf = 'MMM-D-YYYY hh:mm:ss A';
-                    } else if(dtf==7) {
-                        dtf = 'YYYY/MMM/D hh:mm:ss A';
-                    } else if(dtf==8) {
-                        dtf = 'YYYY, MMM D hh:mm:ss A';
-                    } else if(dtf==9) {
-                        dtf = 'YYYY-MMM-D hh:mm:ss A';
-                    }
-                    return  moment(d).format(dtf);
-                    <!-- //return d; -->
-                }", 
-            'aTargets' => array(6))
-        ))
+                
                 ->setOrder(array(6=>'desc'))  
                 ->setClass('table table-hover table-bordered table-striped')
                 ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/organization/show.blade.php

@@ -49,16 +49,16 @@ class="active"
             <div class="box-footer no-padding">
                 <ul class="nav nav-stacked">
                     @if($orgs->phone)<li><a>
-                            <b>{!! Lang::get('lang.phone') !!}</b>  
-                            <span class="pull-right"> {{$orgs->phone}}</span></a></li>@endif
+                        <b>{!! Lang::get('lang.phone') !!}</b>  
+                        <span class="pull-right"> {{$orgs->phone}}</span></a></li>@endif
                     @if($orgs->address)<li><a>
-                            <b>{!! Lang::get('lang.address') !!}</b>  
-                            <br/> <center>{!! $orgs->address !!}</center></a></li>@endif
+                        <b>{!! Lang::get('lang.address') !!}</b>  
+                        <br/> <center>{!! $orgs->address !!}</center></a></li>@endif
                     @if($orgs->internal_notes)<li><a>
-                            <b>{!! Lang::get('lang.internal_notes') !!}</b>  
-                            <br/> <center>{!! $orgs->internal_notes !!}</center></a></li>@endif
+                        <b>{!! Lang::get('lang.internal_notes') !!}</b>  
+                        <br/> <center>{!! $orgs->internal_notes !!}</center></a></li>@endif
                 </ul>
-                <button data-toggle="modal" data-target="#assign_head" id="button_select" class="btn btn-primary btn-flat btn-block">{!! Lang::get('lang.select_department_manager') !!}</button>
+                <button data-toggle="modal" data-target="#assign_head" id="button_select" class="btn btn-primary btn-flat btn-block">{!! Lang::get('lang.select_organization_manager') !!}</button>
             </div>
         </div>
         <div id="refresh1"> 
@@ -130,13 +130,9 @@ class="active"
         foreach ($user_orga_relations as $user_orga_relation) {
             $user_orga_relation_id[] = $user_orga_relation->user_id;
         }
-//        dd($user_orga_relation_id);
-//        $models = \App\Model\helpdesk\Ticket\Tickets::whereIn('user_id', $user_orga_relation_id)->get();
-
         $open = count(\App\Model\helpdesk\Ticket\Tickets::whereIn('user_id', $user_orga_relation_id)->where('status', '=', '1')->get());
         $counted = count(\App\Model\helpdesk\Ticket\Tickets::whereIn('user_id', $user_orga_relation_id)->where('status', '=', '2')->get());
         $deleted = count(\App\Model\helpdesk\Ticket\Tickets::whereIn('user_id', $user_orga_relation_id)->where('status', '=', '5')->get());
-//        dd($open);
         ?>
         <div class="nav-tabs-custom">
             <ul class="nav nav-tabs">
@@ -245,7 +241,7 @@ class="active"
                                             @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
                                         <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
                                         <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first(); ?>
-                                        <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
+                                        <td class="mailbox-priority">@if($priority != null)<spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam>@endif</td>
                                 <?php $from = App\User::where('id', '=', $ticket->user_id)->first(); ?> 
                                 <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
                                 <td>{!! $assigned !!}</td>
@@ -363,7 +359,7 @@ class="active"
                                             @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
                                         <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
                                         <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first(); ?>
-                                        <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
+                                        <td class="mailbox-priority">@if($priority != null)<spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam>@endif</td>
                                 <?php $from = App\User::where('id', '=', $ticket->user_id)->first(); ?> 
                                 <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
                                 <td>{!! $assigned !!}</td>
@@ -485,7 +481,7 @@ class="active"
                                             @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
                                         <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
                                         <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first(); ?>
-                                        <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
+                                        <td class="mailbox-priority">@if($priority != null)<spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam>@endif</td>
                                 <?php $from = App\User::where('id', '=', $ticket->user_id)->first(); ?> 
                                 <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
                                 <td>{!! $assigned !!}</td>

resources/views/themes/default1/agent/helpdesk/ticket/answered.blade.php

@@ -60,6 +60,7 @@ if (Auth::user()->role == 'agent') {
             <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
             <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
             <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
             <!-- table -->
@@ -73,37 +74,7 @@ if (Auth::user()->role == 'agent') {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity'))
             ->setUrl(route('get.answered.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            ))
+            
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/ticket/assigned.blade.php

@@ -55,6 +55,7 @@ if (Auth::user()->role == 'agent') {
         <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
         <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
             <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
             <!-- table -->
@@ -68,37 +69,7 @@ if (Auth::user()->role == 'agent') {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity'))
             ->setUrl(route('get.assigned.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            )) 
+            
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/ticket/closed.blade.php

@@ -55,6 +55,7 @@ if (Auth::user()->role == 'agent') {
         <input type="submit" class="btn btn-default text-orange btn-sm" name="submit" id="delete" value="{!! Lang::get('lang.delete') !!}">
         <input type="submit" class="btn btn-default text-blue btn-sm" name="submit" id="close" value="{!! Lang::get('lang.open') !!}">
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages"  id="refresh">
             <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
             <!-- table -->
@@ -68,37 +69,7 @@ if (Auth::user()->role == 'agent') {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity')) 
             ->setUrl(route('get.closed.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            ))
+           
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/ticket/getautocomplete.blade.php

@@ -0,0 +1,18 @@
+<?php
+$term=$_GET["term"];
+$users = app\User::where('email', 'LIKE', '%'.$term.'%')->where('active', '=', 1)->get();
+$json=array();
+foreach ($users as $user) {
+    $json[] = array(
+        'value'=> $user["email"],
+        'label'=>'Name: '.$user["first_name"] .' '.$user["last_name"].' | '.('Email: <'.$user["email"].'>'),
+        'email' =>$user["email"],
+        'user_name' =>$user["user_name"],
+        'first_name' =>$user["first_name"],
+        'last_name' =>$user["last_name"],
+        'country_code' =>$user["country_code"],
+        'mobile' =>$user["mobile"],
+        'phone_number' =>$user["phone_number"]
+    );
+}
+echo json_encode($json);

resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php

@@ -56,6 +56,7 @@ if (Auth::user()->role == 'agent') {
             <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
             <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
             <!--datatable-->
             {!! Datatable::table()
@@ -68,37 +69,7 @@ if (Auth::user()->role == 'agent') {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity'))
             ->setUrl(route('get.inbox.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            ))
+            
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnCreatedRow", 'function( nRow, aData, iDataIndex ) {

resources/views/themes/default1/agent/helpdesk/ticket/myticket.blade.php

@@ -56,6 +56,7 @@ if (Auth::user()->role == 'agent') {
         <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
         <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages"  id="refresh">
             <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
             <!-- table -->
@@ -69,37 +70,7 @@ if (Auth::user()->role == 'agent') {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity'))
             ->setUrl(route('get.myticket.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            )) 
+            
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php

@@ -16,7 +16,10 @@ class="active"
 <h1>{{Lang::get('lang.tickets')}}</h1>
 @stop
 
+
 @section('content')
+
+
 <!-- Main content -->
 {!! Form::open(['route'=>'post.newticket','method'=>'post','id'=>'form']) !!}
 <div class="box box-primary">
@@ -72,19 +75,29 @@ class="active"
 
         <div class="form-group">
             <div class="row">
-                <div class="col-md-6">
+                <div class="col-md-4">
                     <!-- email -->
                     <div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
                         {!! Form::label('email',Lang::get('lang.email')) !!} <span class="text-red"> *</span>
-                        {!! Form::text('email',null,['class' => 'form-control']) !!}
+                       <!--  {!! Form::text('email',null,['class' => 'form-control'],['id' => 'email']) !!} -->
+                       <input type="text" name="email" id="email" class="form-control">
                     </div>
                 </div>
 
-                <div class="col-md-6">
+                <div class="col-md-4">
+                    <!-- email -->
+                    <div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
+                        {!! Form::label('email',Lang::get('lang.first_name')) !!} <span class="text-red"> *</span>
+                       <!--  {!! Form::text('email',null,['class' => 'form-control'],['id' => 'email']) !!} -->
+                       <input type="text" name="first_name" id="first_name" class="form-control">
+                    </div>
+                </div>
+
+                <div class="col-md-4">
                     <!-- full name -->
-                    <div class="form-group {{ $errors->has('fullname') ? 'has-error' : '' }}">
-                        {!! Form::label('fullname',Lang::get('lang.full_name')) !!} <span class="text-red"> *</span>
-                        {!! Form::text('fullname',null,['class' => 'form-control']) !!}
+                    <div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
+                        {!! Form::label('fullname',Lang::get('lang.last_name')) !!} <span class="text-red"></span>
+                        <input type="text" name="last_name" id="last_name" class="form-control">
                     </div>
                 </div>
             </div>
@@ -92,13 +105,13 @@ class="active"
                 <div class="col-md-1 form-group {{ Session::has('country_code_error') ? 'has-error' : '' }}">
 
                     {!! Form::label('code',Lang::get('lang.country-code')) !!}
-                    {!! Form::text('code',null,['class' => 'form-control', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code')]) !!}
+                    {!! Form::text('code',null,['class' => 'form-control', 'id' => 'country_code', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code')]) !!}
                 </div>
                 <div class="col-md-5">
                     <!-- phone -->
                     <div class="form-group {{ $errors->has('mobile') ? 'has-error' : '' }}">
                         <label>{!! Lang::get('lang.mobile_number') !!}:</label>
-                        {!! Form::input('number','mobile',null,['class' => 'form-control']) !!}
+                        {!! Form::input('number','mobile',null,['class' => 'form-control', 'id' => 'mobile']) !!}
                         {!! $errors->first('mobile', '<spam class="help-block text-red">:message</spam>') !!}
                     </div>
                 </div>
@@ -106,7 +119,8 @@ class="active"
                     <!-- phone -->
                     <div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
                         <label>{!! Lang::get('lang.phone') !!}:</label>
-                        {!! Form::input('number','phone',null,['class' => 'form-control']) !!}
+                         <input type="text" name="phone_number" id="phone_number" class="form-control">
+                       <!--  {!! Form::input('number','phone',null,['class' => 'form-control']) !!} -->
                         {!! $errors->first('phone', '<spam class="help-block text-red">:message</spam>') !!}
                     </div>
                 </div>
@@ -132,7 +146,7 @@ class="active"
                     <div class="form-group">
                         <label>{!! Lang::get('lang.help_topic') !!}:</label>
                         <!-- helptopic -->
-                        <?php $helptopic = App\Model\helpdesk\Manage\Help_topic::all(); ?>
+                        <?php $helptopic = App\Model\helpdesk\Manage\Help_topic::where('status','=',1)->get(); ?>
                         {!! Form::select('helptopic', ['Helptopic'=>$helptopic->lists('topic','id')->toArray()],null,['class' => 'form-control select']) !!}
                     </div>
                 </div>
@@ -221,6 +235,24 @@ class="active"
         $("textarea").wysihtml5();
     });
 
+                $(document).ready(function(){                   
+                    $("#email").autocomplete({
+                        source:"{!!URL::route('post.newticket.autofill')!!}",
+                        minLength:1,
+                        select:function(evt, ui) {
+                            // this.form.phone_number.value = ui.item.phone_number;
+                            // this.form.user_name.value = ui.item.user_name;
+                            this.form.first_name.value = ui.item.first_name;
+                            this.form.last_name.value = ui.item.last_name;
+                            this.form.country_code.value = ui.item.country_code;
+                            this.form.phone_number.value = ui.item.phone_number;
+                            this.form.mobile.value = ui.item.mobile;
+                    
+                        }
+                    });
+                });
+
+
     $(document).ready(function() {
         $('#form').submit(function() {
             var duedate = document.getElementById('datemask').value;
@@ -242,7 +274,9 @@ class="active"
     $(function() {
         $('#datemask').datepicker({changeMonth: true, changeYear: true}).mask('99/99/9999');
     });
-</script>
+
+        
+        </script>
 
 @stop
 

resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php

@@ -61,6 +61,7 @@ if (Auth::user()->role == 'agent') {
         <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
         <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
             <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
             <!-- table -->
@@ -74,37 +75,7 @@ if (Auth::user()->role == 'agent') {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity'))
             ->setUrl(route('get.open.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            )) 
+            
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/ticket/overdue.blade.php

@@ -75,6 +75,7 @@ if ($i == 0) {
             <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
             <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages" id="refresh">
             <!--datatable-->
             {!! Datatable::table()
@@ -87,37 +88,7 @@ if ($i == 0) {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity'))
             ->setUrl(route('get.overdue.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            ))
+            
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/ticket/pdf.blade.php

@@ -2,41 +2,55 @@
 <html>
     <head>
         <title>PDF</title>
-        <!-- <link href="{{asset("downloads/bootstrap.min.css")}}" rel="stylesheet" type="text/css" /> -->
-        <link href="{{asset("lb-faveo/aaaaaa/css/AdminLTE.min.css")}}" rel="stylesheet" type="text/css" />
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <style type="text/css">
+            * {
+                font-family: "DejaVu Sans Mono", monospace;
+            }
+        </style>
     </head>
-    <body>
+    <?php 
+    $rtl = App\Model\helpdesk\Settings\CommonSettings::where('option_name', '=', 'enable_rtl')->first();
+                if($rtl->option_value == 1) {
+                    echo '<body style="direction: rtl; text-align: right;">';
+                } else {
+                    echo '<body>';
+                }
+    ?>
         <h2>
-           <div id="logo" class="site-logo text-center" style="font-size: 30px;">
-                <?php 
+            <div id="logo" class="site-logo text-center" style="font-size: 30px;">
+                <?php
                 $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first();
-				$system = App\Model\helpdesk\Settings\System::where('id', '=', '1')->first();
-				?>
-				@if($system->url)
-					<a href="{!! $system->url !!}" rel="home">
-				@else
-					<a href="{{url('/')}}" rel="home">
-				@endif
-                @if($company->use_logo == 1)
-                	<img src="{{asset('lb-faveo/media/company')}}{{'/'}}{{$company->logo}}" alt="User Image" width="200px" height="200px"/>
-                @else
-                	@if($system->name)
-                		{!! $system->name !!}
-                	@else
-                		<b>SUPPORT</b> CENTER
-                	@endif
-                @endif
-                </a>
-           </div>
-
+                $system = App\Model\helpdesk\Settings\System::where('id', '=', '1')->first();
+                ?>
+                <center>
+                    @if($system->url)
+                    <a href="{!! $system->url !!}" rel="home">
+                        @else
+                        <a href="{{url('/')}}" rel="home" style="text-decoration:none;">
+                            @endif
+                            @if($company->use_logo == 1)
+                            <img src="{!! public_path().'/uploads/company'.'/'.$company->logo !!}" width="100px;"/>
+                            @else
+                            @if($system->name)
+                            {!! $system->name !!}
+                            @else
+                            <b>SUPPORT</b> CENTER
+                            @endif
+                            @endif
+                        </a>
+                </center>
+            </div>
         </h2>
-<hr>
-        <h4>{{$thread->title}}</h4><br/>
+        <hr>
+        <h4>{!! $thread->title !!}</h4><br/>
 
-<?php   $ticket_source = App\Model\helpdesk\Ticket\Ticket_source::where('id','=',$tickets->source)->first();
+        <?php
+        $ticket_source = App\Model\helpdesk\Ticket\Ticket_source::where('id', '=', $tickets->source)->first();
         $ticket_source = $ticket_source->value;
 
-        $user = App\User::where('id', '=', $tickets->user_id)->first(); ?>
+        $user = App\User::where('id', '=', $tickets->user_id)->first();
+        ?>
         <?php $response = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $tickets->id)->get(); ?>
         @foreach($response as $last)
         <?php $ResponseDate = $last->created_at; ?>
@@ -46,7 +60,7 @@
         <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first(); ?>
         <?php $help_topic = App\Model\helpdesk\Manage\Help_topic::where('id', '=', $tickets->help_topic_id)->first(); ?>
         <?php $help_topic = App\Model\helpdesk\Manage\Help_topic::where('id', '=', $tickets->help_topic_id)->first(); ?>
-<?php $dept = App\Model\helpdesk\Agent\Department::where('id','=',$help_topic->department)->first();   ?>
+        <?php $dept = App\Model\helpdesk\Agent\Department::where('id', '=', $help_topic->department)->first(); ?>
         <table class="table">    
             <tr><th></th><th></th></tr>
             <tr><td><b>{!! Lang::get('lang.status') !!}:</b></td>       	<td>{{$status->state}}</td></tr>
@@ -58,169 +72,178 @@
             <tr><td><b>{!! Lang::get('lang.help_topic') !!}:</b></td>     <td>{{$help_topic->topic}}</td></tr>
         </table>
 
-        <?php $conversations = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $tickets->id)->get(); ?>
+        <?php $conversations = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $tickets->id)->orderBy('created_at', 'desc')->paginate(10); ?>
         @foreach($conversations as $conversation)
         <br/><hr>
         <span class="time-label">
-                                <?php
-    $role = App\User::where('id','=',$conversation->user_id)->first();
-    ?>
-                                <?php if($conversation->is_internal) { ?>
-                                <i class="fa fa-tag bg-purple" title="Posted by System"></i>
-                                    <?php }else{ if ($role->role == 'agent' || $role->role == 'admin') { ?>
-                                    <i class="fa fa-mail-reply-all bg-yellow" title="Posted by Support Team"></i>
-                                <?php } elseif ($role->role == 'user') {  ?>
-                                    <i class="fa fa-user bg-aqua" title="Posted by Customer"></i>
-                                <?php } else { ?>
-                                    <i class="fa fa-mail-reply-all bg-purple" title="Posted by System"></i>
-    <?php } }
-    $attachment = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id','=',$conversation->id)->first();
-    if($attachment == null ) {
-        $body = $conversation->body;
-    }
-    else {
-        // dd($attachment->file);
-        // print $attachment->file;
-        // header("Content-type: image/jpeg");
-        // echo "<img src='".base64_decode($attachment->file)."' style='width:128px;height:128px'/> ";
-        $body = $conversation->body;
-        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id','=',$conversation->id)->orderBy('id', 'DESC')->get();
-                    foreach($attachments as $attachment)
-                    {
-                        // $i++;
-                        if ($attachment->type == 'pdf' || $attachment->type == 'PDF') {
-                            // echo "hello";
-                        } elseif ($attachment->type == 'docx' || $attachment->type =='DOCX') {
-                            // echo "hello";
-                        } elseif ($attachment->type == 'html' || $attachment->type =='HTML') {
-                            // echo "hello";
-                        } elseif ($attachment->type == 'zip' || $attachment->type =='ZIP') {
-                            // echo "hello";
-                        } else {
-                        $image = @imagecreatefromstring($attachment->file); 
-                        ob_start();
-                        imagejpeg($image, null, 80);
-                        $data = ob_get_contents();
-                        ob_end_clean();
-                        $var  =  '<img width="20px" src="data:image/jpg;base64,' .  base64_encode($data)  . '" />';
-                        // echo $var;
-                        // echo $attachment->name;
-                        // $body = explode($attachment->name, $body);
-                        $body = str_replace($attachment->name, "data:image/jpg;base64," .  base64_encode($data), $body);
+            @if($conversation->user_id != null) 
+                <?php
+                
+                $role = App\User::where('id', '=', $conversation->user_id)->first();
+                ?>
+            
+                <?php if ($conversation->is_internal) { ?>
+                    <i class="fa fa-tag bg-purple" title="Posted by System"></i>
+                    <?php
+                } else {
+                    if ($role->role == 'agent' || $role->role == 'admin') {
+                        ?>
+                        <i class="fa fa-mail-reply-all bg-yellow" title="Posted by Support Team"></i>
+                    <?php } elseif ($role->role == 'user') { ?>
+                        <i class="fa fa-user bg-aqua" title="Posted by Customer"></i>
+                    <?php } else { ?>
+                        <i class="fa fa-mail-reply-all bg-purple" title="Posted by System"></i>
+                        <?php
+                    }
+                }
+                ?>
+            @endif
+            <?php
+            $attachment = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $conversation->id)->first();
+            if ($attachment == null) {
+                $body = $conversation->body;
+            } else {
+                // dd($attachment->file);
+                // print $attachment->file;
+                // header("Content-type: image/jpeg");
+                // echo "<img src='".base64_decode($attachment->file)."' style='width:128px;height:128px'/> ";
+                $body = $conversation->body;
+                $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $conversation->id)->where('poster', '=', 'INLINE')->get();
 
-                            $string = $body;                        
+                foreach ($attachments as $attachment) {
+
+                    if ($attachment->type == 'pdf' || $attachment->type == 'PDF') {
+                        // echo "hello";
+                    } elseif ($attachment->type == 'docx' || $attachment->type == 'DOCX') {
+                        // echo "hello";
+                    } elseif ($attachment->type == 'html' || $attachment->type == 'HTML') {
+                        // echo "hello";
+                    } elseif ($attachment->type == 'zip' || $attachment->type == 'ZIP') {
+                        // echo "hello";
+                    } else {
+                        try {
+                            $image = @imagecreatefromstring($attachment->file);
+                            ob_start();
+                            imagejpeg($image, null, 80);
+                            $data = ob_get_contents();
+                            ob_end_clean();
+                            $var = '<img width="20px" src="data:image/jpg;base64,' . base64_encode($data) . '" />';
+                            // echo $var;
+                            // echo $attachment->name;
+                            // $body = explode($attachment->name, $body);
+                            $body = str_replace($attachment->name, "data:image/jpg;base64," . base64_encode($data), $body);
+
+                            $string = $body;
                             $start = "<head>";
                             $end = "</head>";
-                            if(strpos($string,$start) == false || strpos($string,$start) == false)
-                            {
-                            }
-                            else
-                            {
-                            $ini = strpos($string,$start);
-                            $ini += strlen($start);
-                            $len = strpos($string,$end,$ini) - $ini;
-                            $parsed = substr($string,$ini,$len);
-                            $body2 = $parsed;
-                            $body = str_replace($body2 ," " ,$body);
+                            if (strpos($string, $start) == false || strpos($string, $start) == false) {
+                                
+                            } else {
+                                $ini = strpos($string, $start);
+                                $ini += strlen($start);
+                                $len = strpos($string, $end, $ini) - $ini;
+                                $parsed = substr($string, $ini, $len);
+                                $body2 = $parsed;
+                                $body = str_replace($body2, " ", $body);
                             }
+                        } catch (\Exception $e) {
+                            
                         }
                     }
-                    // echo $body;
+                }
+                // echo $body;
+                // $body = explode($attachment->file, $body);
+                // $body = $body[0];
+//                }
+            }
+            ?>
 
-        // $body = explode($attachment->file, $body);
-        // $body = $body[0];
-    }
-    ?>
+            <?php
+            $string = $body;
+            $start = "<head>";
+            $end = "</head>";
+            if (strpos($string, $start) == false || strpos($string, $start) == false) {
+                
+            } else {
+                $ini = strpos($string, $start);
+                $ini += strlen($start);
+                $len = strpos($string, $end, $ini) - $ini;
+                $parsed = substr($string, $ini, $len);
+                $body2 = $parsed;
+                $body = str_replace($body2, " ", $body);
+            }
+            ?>
+            <div class="timeline-item">
+                <!--<span id="date" class="time"  style="color:#fff;"><i class="fa fa-clock-o"> </i> {{date_format($conversation->created_at, 'd/m/Y H:i:s')}}</span>-->
 
-    <?php
-                            $string = $body;                        
-                            $start = "<head>";
-                            $end = "</head>";                            
-                            if(strpos($string,$start) == false || strpos($string,$start) == false)
-                            {
-                            }
-                            else
-                            {
-                            $ini = strpos($string,$start);
-                            $ini += strlen($start);
-                            $len = strpos($string,$end,$ini) - $ini;
-                            $parsed = substr($string,$ini,$len);
-                            $body2 = $parsed;
-                            $body = str_replace($body2 ," " ,$body);
-                            }
-    ?>
-                                <div class="timeline-item">
-                                    <span id="date" class="time"  style="color:#fff;"><i class="fa fa-clock-o"> </i> {{date_format($conversation->created_at, 'd/m/Y H:i:s')}}</span>
-
-                                    <h3 class="timeline-header"  style="background-color:<?php 
-                                    if($conversation->is_internal)
-                                    {
-                                        $color = '#046380'; 
-                                        echo $color; 
+                <h3 class="timeline-header"  style="background-color:<?php
+                if ($conversation->is_internal) {
+                    $color = '#046380';
+                    echo $color;
+                } else {
+                    if ($role->role == 'agent' || $role->role == 'admin') {
+                        $color = '#FFD34E';
+                        echo $color;
+                    } elseif ($role->role == 'user') {
+                        $color = '#00A388';
+                        echo $color;
+                    } else {
+                        $color = '#046380';
+                        echo $color;
+                    }
+                }
+                ?>;
+                    ">
+                    <a href="#" style="text-decoration:none; color:#fff;"><?php
+                    if($conversation->user_id != null) {
+                        if ($role->role == "user") {
+                            echo $role->user_name;
+                        } else {
+                            echo $role->first_name . " " . $role->last_name;
+                        }
+                    } else { echo Lang::get('lang.system'); }   ?> </a><strong>{!! Lang::get('lang.date') !!}:</strong> {!! $thread->created_at !!}<br/></h3>
+                <div class="timeline-body" style="padding-left:30px;">
+                    {!! $body !!}
+                </div>
+                <div class="timeline-footer" >
+                    <?php
+                    $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $conversation->id)->get();
+                    $i = 0;
+                    foreach ($attachments as $attachment) {
+                        if ($attachment->poster == 'ATTACHMENT') {
+                            $i++;
+                        }
+                    }
+                    if ($i > 0) {
+                        echo "<hr style='height:1px;color:#2D3244;background-color:#2D3244;''><h4 class='box-title'><b>" . $i . " </b> Attachments</h4>";
+                    }
+                    ?>
+                    <ul class='mailbox-attachments clearfix'>
+                        <?php
+                        foreach ($attachments as $attachment) {
+                            if ($attachment->poster == 'ATTACHMENT') {
+                                try {
+                                    if ($attachment->type == 'jpg' || $attachment->type == 'JPG' || $attachment->type == 'jpeg' || $attachment->type == 'JPEG' || $attachment->type == 'png' || $attachment->type == 'PNG' || $attachment->type == 'gif' || $attachment->type == 'GIF') {
+                                        $image = @imagecreatefromstring($attachment->file);
+                                        ob_start();
+                                        imagejpeg($image, null, 80);
+                                        $data = ob_get_contents();
+                                        ob_end_clean();
+                                        $var = '<a href="' . URL::route('image', array('image_id' => $attachment->id)) . '" target="_blank"><img style="max-width:200px;max-height:150px;" src="data:image/jpg;base64,' . base64_encode($data) . '"/></a>';
+                                        echo '<li><span class="mailbox-attachment-icon has-img">' . $var . '</span></li>';
+                                    } else {
+                                        $var = '<a href="' . URL::route('image', array('image_id' => $attachment->id)) . '" target="_blank">' . $attachment->name . '</a>';
+                                        echo '<li>' . $var . '</li>';
                                     }
-                                    else
-                                    {
-                                    if ($role->role == 'agent' || $role->role == 'admin') 
-                                        { 
-                                            $color = '#FFD34E'; 
-                                            echo $color; 
-                                        } elseif ($role->role == 'user') 
-                                        { 
-                                            $color = '#00A388'; 
-                                            echo $color; 
-                                        } else 
-                                        { 
-                                            $color = '#046380'; 
-                                            echo $color; 
-                                        } 
-                                    }
-                                        ?>;
-                                        ">
-                                        <a href="#" style="color:#fff;"><?php if($role->role == "user") {echo $role->user_name; } else { echo $role->first_name . " " . $role->last_name; } ?> </a><strong>{!! Lang::get('lang.date') !!}:</strong> {!! $thread->created_at !!}<br/></h3>
-                                    <div class="timeline-body" style="padding-left:30px;">
-                                            {!! $body !!}
-                                    </div>
-                                    <div class="timeline-footer" >
-                                        <?php 
-                                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id','=',$conversation->id)->get();
-                                        $i = 0;
-                                        foreach($attachments as $attachment) {
-                                        if($attachment->poster == 'ATTACHMENT') {
-                                            $i++;
-                                            } 
-                                        }
-                                        if($i>0)
-                                        {
-                                        echo "<hr style='height:1px;color:#2D3244;background-color:#2D3244;''><h4 class='box-title'><b>".$i." </b> Attachments</h4>";
-                                        }
-                                        ?>
-                                        <ul class='mailbox-attachments clearfix'>
-                                        <?php
-                                        foreach($attachments as $attachment)
-                                        {
-                                            if($attachment->poster == 'ATTACHMENT')
-                                            {
-                                                if($attachment->type == 'jpg'||$attachment->type == 'JPG'||$attachment->type == 'jpeg'||$attachment->type == 'JPEG'||$attachment->type == 'png'||$attachment->type == 'PNG'||$attachment->type == 'gif'||$attachment->type == 'GIF')
-                                                {
-                                                $image = @imagecreatefromstring($attachment->file); 
-                                                ob_start();
-                                                imagejpeg($image, null, 80);
-                                                $data = ob_get_contents();
-                                                ob_end_clean();
-                                                $var = '<a href="'.URL::route('image', array('image_id' => $attachment->id)).'" target="_blank"><img style="max-width:200px;max-height:150px;" src="data:image/jpg;base64,' . base64_encode($data)  . '"/></a>';
-                                                echo '<li><span class="mailbox-attachment-icon has-img">'.$var.'</span></li>';
-                                                }
-                                                else
-                                                {
-                                                $var = '<a href="'.URL::route('image', array('image_id' => $attachment->id)).'" target="_blank">'.$attachment->name.'</a>';
-                                                echo '<li>'.$var.'</li>';   
-                                                }                                            
-                                            }
-                                        }
-                                        ?>
-                                        </ul>
-                                    </div>
-                                </div>
-        @endforeach
+                                } catch (\Exception $e) {
+                                    
+                                }
+                            }
+                        }
+                        ?>
+                    </ul>
+                </div>
+            </div>
+            @endforeach
     </body>
 </html>

resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php

@@ -7,6 +7,7 @@ class="active"
 @section('ticket-bar')
 active
 @stop
+
 @section('PageHeader')
 <h1>{{Lang::get('lang.ticket-details')}}</h1>
 @stop
@@ -18,7 +19,6 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where(
 ?>
 
 @section('sidebar')
-
 <li class="header">{!! Lang::get('lang.Ticket_Information') !!} </li>
 <li>
     <a href="">
@@ -236,8 +236,8 @@ if ($thread->title != "") {
                     <div class="col-md-6">
                         <?php
                         $user_phone = App\User::where('mobile', '=', $thread->user_id)->first();
-                        $TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $thread->ticket_id)->max('id');
-                        $TicketDatarow = App\Model\helpdesk\Ticket\Ticket_Thread::where('id', '=', $TicketData)->first();
+                        $TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $thread->ticket_id)->where('is_internal', '=', 0)->max('id');
+                        $TicketDatarow = App\Model\helpdesk\Ticket\Ticket_Thread::where('id', '=', $TicketData)->where('is_internal', '=', 0)->first();
                         $LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first();
                         if ($LastResponse->role == "user") {
                             $rep = "#F39C12";
@@ -262,7 +262,6 @@ if ($thread->title != "") {
                                 @if($user->mobile !=null)<tr><td><b>{!! Lang::get('lang.mobile') !!}:</b></td>          <td>{{$user->ext . $user->phone_number}}</td></tr>@endif
                                 <tr><td><b>{!! Lang::get('lang.source') !!}:</b></td>         <td>{{$ticket_source}}</td></tr>
                                 <tr><td><b>{!! Lang::get('lang.help_topic') !!}:</b></td>     <?php $help_topic = App\Model\helpdesk\Manage\Help_topic::where('id', '=', $tickets->help_topic_id)->first(); ?><td title="{{$help_topic->topic}}">{{$help_topic->topic}}</td></tr>
-                                <?php Event::fire(new App\Events\TicketDetailTable($TicketData)); ?>
                                 <tr><td><b>{!! Lang::get('lang.last_message') !!}:</b></td>   <td>{{$username}}</td></tr>
                                 <?php Event::fire(new App\Events\TicketDetailTable($TicketData)); ?>
                             </div>
@@ -273,7 +272,7 @@ if ($thread->title != "") {
         </div>
     </div>
 </div>
-{{-- Event fire --}}
+<?php Event::fire('ticket.timeline.marble',array($TicketData));?>
 <div id="gifshow" style="display:none">
     <img src="{{asset("lb-faveo/media/images/gifloader.gif")}}">
 </div>  <!-- added 05/05/2016-->
@@ -291,7 +290,6 @@ if ($thread->title != "") {
             <div class="tab-content">
                 <div id="alert21" class="alert alert-success alert-dismissable" style="display:none;">
                     <button id="dismiss21" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <h4><i class="icon fa fa-check"></i>{!! Lang::get('lang.alert') !!}!</h4>
                     <div id="message-success2"></div>
                 </div>
                 <div id="alert22" class="alert alert-warning alert-dismissable" style="display:none;">
@@ -300,11 +298,10 @@ if ($thread->title != "") {
                 </div>
                 <div id="alert23" class="alert alert-danger alert-dismissable" style="display:none;">
                     <button id="dismiss23" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <h4><i class="icon fa fa-ban"></i>{!! Lang::get('lang.alert') !!}!</h4>
+                    <i class="icon fa fa-ban"></i><b>{!! Lang::get('lang.alert') !!} !</b>
                     <div id="message-danger2"></div>
                 </div>
                 <div class="tab-pane active" id="General">
-
                     <!-- ticket reply -->
                     <div id="show3" style="display:none;">
                         <div class="col-md-4">
@@ -321,7 +318,9 @@ if ($thread->title != "") {
                         </br>
                         </br>
                     </div>
-                    {!! Form::model($tickets->id, ['id'=>'form3', 'name'=>'form3' ,'method' => 'PATCH', 'enctype'=>'multipart/form-data'] )!!}
+                    <form id="form3">
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
+
                     <div id="t1">
                         <div class="form-group">
                             <div class="row">
@@ -374,7 +373,7 @@ if ($thread->title != "") {
                         <div class="form-group">
                             <div class="row">
                                 <!-- reply content -->
-                                <div class="form-group {{ $errors->has('title') ? 'has-error' : '' }}">
+                                <div class="form-group {{ $errors->has('title') ? 'has-error' : '' }}" id="reply_content_class">
                                     <div class="col-md-2">
                                         {!! Form::label('Reply Content', Lang::get('lang.reply_content').':') !!}<span class="text-red"> *</span>
                                     </div>
@@ -383,9 +382,26 @@ if ($thread->title != "") {
                                             <textarea style="width:98%;height:20%;" name="reply_content" class="form-control" id="reply_content"></textarea>
                                         </div>
                                         {!! $errors->first('reply_content', '<spam class="help-block text-red">:message</spam>') !!}
-                                        <br/>
-                                        <div type="file" class="btn btn-default btn-file"><i class="fa fa-paperclip"> </i> {!! Lang::get('lang.attachment') !!}<input type="file" name="attachment[]" multiple/></div><br/>
-                                        {!! Lang::get('lang.max') !!}. 10MB
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="row">
+                                <!-- reply content -->
+                                <div class="form-group {{ $errors->has('title') ? 'has-error' : '' }}" id="reply_content_class">
+                                    <div class="col-md-2">
+                                        <label> {!! Lang::get('lang.attachment') !!}</label>
+                                    </div>
+                                    <div class="col-md-10">
+                                        <div id="reset-attachment">
+                                            <span class='btn btn-default btn-file'> <i class='fa fa-paperclip'></i> <span>{!! Lang::get('lang.upload') !!}</span><input type='file' name='attachment[]' id='attachment' multiple/></span>
+                                            <div id='file_details'></div><div id='total-size'></div>{!! Lang::get('lang.max') !!}. {!! $max_size_in_actual !!}
+                                            <div>
+                                                <a id='clear-file' onClick='clearAll()' style='display:none; cursor:pointer;'><i class='fa fa-close'></i>Clear all</a>
+                                            </div>
+                                        </div>
+                                        
                                     </div>
                                 </div>
                             </div>
@@ -428,7 +444,7 @@ if ($thread->title != "") {
                             <div class="form-group">
                                 <div class="row">
                                     <!-- internal note -->
-                                    <div class="form-group {{ $errors->has('title') ? 'has-error' : '' }}">
+                                    <div class="form-group {{ $errors->has('title') ? 'has-error' : '' }}" id="internal_content_class">
                                         <div class="col-md-2">
                                             <label>{!! Lang::get('lang.internal_note') !!}:<span class="text-red"> *</span></label>
                                         </div>
@@ -476,6 +492,9 @@ if ($thread->title != "") {
                 </ul>
 
                 <div class="col-md-12" >
+                    <link rel="stylesheet" type="text/css" href="{{asset("lb-faveo/css/faveo-css.css")}}">
+                    <link href="{{asset("lb-faveo/css/jquery.rating.css")}}" rel="stylesheet" type="text/css" />
+                    
                     <!-- The time line -->
                     <ul class="timeline">
                         <!-- timeline time label -->
@@ -500,7 +519,9 @@ if ($thread->title != "") {
                                         </span> <?php
                                         $data = $ConvDate[0];
                                     }
-                                    $role = App\User::where('id', '=', $conversation->user_id)->first();
+                                    if($conversation->user_id != null) {
+                                        $role = App\User::where('id', '=', $conversation->user_id)->first();
+                                    } 
                                     ?>
                                 </li>
                                 <li>
@@ -508,13 +529,19 @@ if ($thread->title != "") {
                                         <i class="fa fa-tag bg-purple" title="Posted by System"></i>
                                     <?php
                                     } else {
-                                        if ($role->role == 'agent' || $role->role == 'admin') {
+                                        if($conversation->user_id != null) {
+                                            if ($role->role == 'agent' || $role->role == 'admin') {
+                                                ?>
+                                                <i class="fa fa-mail-reply-all bg-yellow" title="Posted by Support Team"></i>
+                                            <?php } elseif ($role->role == 'user') { ?>
+                                                <i class="fa fa-user bg-aqua" title="Posted by Customer"></i>
+                                            <?php } else { ?>
+                                                <i class="fa fa-mail-reply-all bg-purple" title="Posted by System"></i>
+                                                <?php
+                                            }
+                                        } else {
                                             ?>
-                                            <i class="fa fa-mail-reply-all bg-yellow" title="Posted by Support Team"></i>
-                                        <?php } elseif ($role->role == 'user') { ?>
-                                            <i class="fa fa-user bg-aqua" title="Posted by Customer"></i>
-                                        <?php } else { ?>
-                                            <i class="fa fa-mail-reply-all bg-purple" title="Posted by System"></i>
+                                            <i class="fa fa-tag bg-purple" title="Posted by System"></i>
                                             <?php
                                         }
                                     }
@@ -575,21 +602,26 @@ if ($thread->title != "") {
                                         $body2 = $parsed;
                                         $body = str_replace($body2, " ", $body);
                                     }
-                                    if ($conversation->is_internal) {
-                                        $color = '#A19CFF';
-                                        // echo $color; 
-                                    } else {
-                                        if ($role->role == 'agent' || $role->role == 'admin') {
-                                            $color = '#F9B03B';
-                                        } elseif ($role->role == 'user') {
-                                            $color = '#38D8FF';
+                                    if($conversation->user_id != null) {
+                                        if ($conversation->is_internal) {
+                                            $color = '#A19CFF';
+                                            // echo $color; 
                                         } else {
-                                            $color = '#605CA8';
+                                            if ($role->role == 'agent' || $role->role == 'admin') {
+                                                $color = '#F9B03B';
+                                            } elseif ($role->role == 'user') {
+                                                $color = '#38D8FF';
+                                            } else {
+                                                $color = '#605CA8';
+                                            }
                                         }
                                     }
                                     ?>
                                     <div class="timeline-item">
                                         <span style="color:#fff;"><div class="pull-right">   <table><tbody>
+                                                @if($role)
+                                                    @if($role->role != null)
+                                                        @if($role->role != 'user' && $conversation->is_internal != 1)
                                                         @foreach($ratings as $rating) 
                                                         @if($rating->rating_area == 'Comment Area')
                                                         <?php
@@ -602,32 +634,47 @@ if ($thread->title != "") {
                                                         ?>
                                                         <tr>
                                                             <th><div class="ticketratingtitle" style="color:#3c8dbc;" >{!! $rating->name !!} &nbsp;</div></th>&nbsp
-                                                    <td>
+                                                        <td style="button:disabled;">
                                                         <?php for ($i = 1; $i <= $rating->rating_scale; $i++) { ?>
-                                                            <input type="radio" class="star" id="star5" name="{!! $rating->name !!},{!! $conversation->id !!}" value="{!! $i !!}"<?php echo ($ratingval == $i) ? 'checked' : '' ?> />
-        <?php } ?>&nbsp;&nbsp;&nbsp;&nbsp;
-                                                    </td> 
-                                                    </tr>
+                                                            <input type="radio" class="star star-rating-readonly" id="star5" name="{!! $rating->name !!},{!! $conversation->id !!}" value="{!! $i !!}"<?php echo ($ratingval == $i) ? 'checked' : '' ?> />
+                                                        <?php } ?>&nbsp;&nbsp;&nbsp;&nbsp;   
+                                                        </td> 
+                                                        </tr>
+                                                        @endif
+                                                        @endforeach
                                                     @endif
-                                                    @endforeach
+                                                @endif
+                                            @endif
                                                     </tbody></table></div>  
                                         </span>
                                         <h3 class="timeline-header">
                                             <?php
-                                            if ($role->role == "user") {
-                                                $usernam = $role->user_name;
+                                            if($conversation->user_id != null) {
+                                                if ($role->role == "user") {
+                                                    $usernam = $role->user_name;
+                                                } else {
+                                                    $usernam = $role->first_name . " " . $role->last_name;
+                                                }
                                             } else {
-                                                $usernam = $role->first_name . " " . $role->last_name;
+                                                $usernam = Lang::get('lang.system');
                                             }
                                             ?>
                                             <div class="user-block" style="margin-bottom:-5px;margin-top:-2px;">
-                                                @if($role->profile_pic != null)
-                                                <img src="{{$role->profile_pic}}"class="img-circle img-bordered-sm" alt="User Image"/>
-                                                @else
-                                                <img src="{{ Gravatar::src($role->email) }}" class="img-circle img-bordered-sm" alt="img-circle img-bordered-sm">
+                                                @if($conversation->user_id != null) 
+                                                    @if($role->profile_pic != null)
+                                                    <img src="{{$role->profile_pic}}"class="img-circle img-bordered-sm" alt="User Image"/>
+                                                    @else
+                                                    <img src="{{ Gravatar::src($role->email) }}" class="img-circle img-bordered-sm" alt="img-circle img-bordered-sm">
+                                                    @endif
+                                                @else 
+                                                    <img src="{{asset('lb-faveo/media/images/avatar_1.png')}}" class="img-circle img-bordered-sm" alt="img-circle img-bordered-sm">
                                                 @endif
                                                 <span class="username"  style="margin-bottom:4px;margin-top:2px;">
-                                                    <a href='{!! url("/user/".$role->id) !!}'>{!! $usernam !!}</a>
+                                                    @if($conversation->user_id != null) 
+                                                        <a href='{!! url("/user/".$role->id) !!}'>{!! $usernam !!}</a>
+                                                    @else
+                                                        {!! $usernam !!}
+                                                    @endif
                                                 </span>
                                                 <span class="description" style="margin-bottom:4px;margin-top:4px;"><i class="fa fa-clock-o"></i> {{UTC::usertimezone($conversation->created_at)}}</span>
 
@@ -635,7 +682,7 @@ if ($thread->title != "") {
 
                                         </h3>
                                         <div class="timeline-body" style="padding-left:30px;margin-bottom:-20px">
-                                            {!! $body !!}
+                                            {!! nl2br($body) !!}
                                         </div>
                                         @if($conversation->id == $ij->id)
         <?php $ticket_form_datas = App\Model\helpdesk\Ticket\Ticket_Form_Data::where('ticket_id', '=', $tickets->id)->get(); ?>
@@ -657,7 +704,9 @@ if ($thread->title != "") {
                                         <br/><br/>
                                         <div class="timeline-footer" style="margin-bottom:-5px">
                                             @if(!$conversation->is_internal)
-                                            <?php Event::fire(new App\Events\Timeline($conversation, $role, $user)); ?>
+                                                @if($conversation->user_id != null)
+                                                    <?php Event::fire(new App\Events\Timeline($conversation, $role, $user)); ?>
+                                                @endif
                                             @endif
                                             <?php
                                             $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $conversation->id)->get();
@@ -709,7 +758,7 @@ if ($thread->title != "") {
                         <ul class="pull-right" style="padding-right:25px;padding-bottom:10px;">
 <?php echo $conversations->setPath(url('/thread/' . $tickets->id))->render(); ?>
                         </ul>
-                    </ul>
+                    </ul>                
                 </div><!-- /.col -->
             </div>
         </div><!-- /.row -->
@@ -720,7 +769,7 @@ if ($thread->title != "") {
 <!-- page modals -->
 <div>
     <!-- Edit Ticket modal -->
-<?php if ($group->can_edit_ticket == 1) { ?>
+    <?php if ($group->can_edit_ticket == 1) { ?>
         <div class="modal fade" id="Edit">
             <div class="modal-dialog" style="width:60%;height:70%;">
                 <div class="modal-content">
@@ -1034,6 +1083,7 @@ if ($thread->title != "") {
                         <div class="tab-pane active" id="ahah">
                             <div class="modal-body" id="def">
                                 <div class="callout callout-info" id="hide1234" ><i class="icon fa fa-info"> </i>&nbsp;&nbsp;&nbsp; {!! Lang::get('lang.search_existing_users_or_add_new_users') !!}</div>
+                                <div id="here"></div>
                                 <div id="show7" style="display:none;">
                                     <div class="row col-md-12">
                                         <div class="col-xs-5">
@@ -1045,7 +1095,7 @@ if ($thread->title != "") {
                                         </div>
                                     </div>
                                 </div>
-                                <div id="here"></div>
+                                
                                 {!! Form::model($tickets->id, ['id'=>'search-user','method' => 'PATCH'] )!!}    
                                 <script src="//code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
                                 <input type="text" class="form-control" name="search" id="tags" placeholder="{!! Lang::get('lang.search_by_email') !!}">
@@ -1243,7 +1293,14 @@ if ($thread->title != "") {
 
 <!-- scripts used on page -->
 <script type="text/javascript">
-
+            function clearAll() {
+                $("#file_details").html("");
+                $("#total-size").html("");
+                $("#attachment").val('');
+                $("#clear-file").hide();
+                $("#replybtn").removeClass('disabled');
+            }
+            
             $(function () {
             $("#InternalContent").wysihtml5();
             });
@@ -1273,12 +1330,12 @@ if ($thread->title != "") {
                             }
                     });
                     return false;
-            });
+                });
             });
             $(function() {
-            $("#tags, #tags2").autocomplete({
-            source: 'auto/<?php echo $tickets->id; ?>'
-            });
+                $("#tags, #tags2").autocomplete({
+                    source: 'auto/<?php echo $tickets->id; ?>'
+                });
             });
             jQuery(document).ready(function() {
     $("#cc_page").on('click', '.search_r', function(){
@@ -1343,10 +1400,6 @@ if ($thread->title != "") {
                     setInterval(function(){
                     $("#alert11").hide();
                             setTimeout(function() {
-                            // var link = document.querySelector('#load-inbox');
-                            // if(link) {
-                            //     link.click();
-                            // }
                             window.location = document.referrer;
                             }, 500);
                     }, 2000);
@@ -1627,6 +1680,19 @@ if ($thread->title != "") {
     });
             // Internal Note
             $('#form2').on('submit', function() {
+                var internal_content = document.getElementById('InternalContent').value;
+                if(internal_content) {
+                    $("#internal_content_class").removeClass('has-error');
+                    $("#alert23").hide();
+                } else {
+                    var message = "<li>{!! Lang::get('lang.internal_content_is_a_required_field') !!}</li>";
+                    $("#internal_content_class").addClass('has-error');
+                    $("#alert23").show();
+                    $('#message-danger2').html(message);
+                    $("#show3").hide();
+                    $("#t1").show();
+                    return false;
+                }
     $.ajax({
     type: "POST",
             url: "../internal/note/{{ $tickets->id }}",
@@ -1642,7 +1708,7 @@ if ($thread->title != "") {
             {
             $("#refresh1").load("../thread/{{$tickets->id}}   #refresh1");
                     // $("#t4").load("../thread/{{$tickets->id}}   #t4");
-                    var message = "Lang::get('lang.you_have_successfully_replied_to_your_ticket')";
+                    var message = "{!! Lang::get('lang.you_have_successfully_replied_to_your_ticket') !!}";
                     $("#alert21").show();
                     $('#message-success2').html(message);
                     setInterval(function(){$("#alert21").hide(); }, 4000);
@@ -1653,6 +1719,16 @@ if ($thread->title != "") {
                     var div1 = document.getElementById('newtextarea1');
                     div1.innerHTML = div1.innerHTML + '<textarea style="width:98%;height:200px;" name="InternalContent" class="form-control" id="InternalContent"/></textarea>';
                     var wysihtml5Editor = $('textarea').wysihtml5().data("wysihtml5").editor;
+                    setInterval(function(){
+                            var head= document.getElementsByTagName('head')[0];
+                            var script= document.createElement('script');
+                            script.type= 'text/javascript';
+                            script.src= '{{asset("lb-faveo/js/jquery.rating.pack.js")}}';
+                            head.appendChild(script);
+//                            $('.rating-cancel').hide();
+//                            $(".star-rating-control").attr("disabled", "disabled").off('hover');
+//                            $(".star-rating-control").addClass("disabled")
+                        }, 4000);
             } else {
             // alert('fail');
             var message = "{!! Lang::get('lang.for_some_reason_your_message_was_not_posted_please_try_again_later') !!}";
@@ -1668,8 +1744,63 @@ if ($thread->title != "") {
             return false;
     });
 // Ticket Reply
+            $('#attachment').change(function() {
+                input = document.getElementById('attachment');
+                if (!input) {
+                    alert("Um, couldn't find the fileinput element.");
+                } else if (!input.files) {
+                    alert("This browser doesn't seem to support the `files` property of file inputs.");
+                } else if (!input.files[0]) {
+                } else {
+                    $("#file_details").html("");
+                    var total_size = 0;
+                    for(i = 0; i < input.files.length; i++) {
+                        file = input.files[i];
+                        var supported_size = "{!! $max_size_in_bytes !!}";
+                        var supported_actual_size = "{!! $max_size_in_actual !!}";
+                        if(file.size < supported_size) {
+                            $("#file_details").append("<tr> <td> " + file.name + " </td><td> " + formatBytes(file.size) + "</td> </tr>");
+                        } else {
+                            $("#file_details").append("<tr style='color:red;'> <td> " + file.name + " </td><td> " + formatBytes(file.size) + "</td> </tr>");
+                        }
+                        total_size += parseInt(file.size);
+                    }
+                    if(total_size > supported_size) {
+                        $("#total-size").append("<span style='color:red'>Your total file upload size is greater than "+ supported_actual_size +"</span>");
+                        $("#replybtn").addClass('disabled');
+                        $("#clear-file").show();
+                    } else {
+                        $("#total-size").html("");
+                        $("#replybtn").removeClass('disabled');
+                        $("#clear-file").show();
+                    }
+                }
+            });
+            
+            function formatBytes(bytes,decimals) {
+                if(bytes == 0) return '0 Byte';
+                var k = 1000;
+                var dm = decimals + 1 || 3;
+                var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+                var i = Math.floor(Math.log(bytes) / Math.log(k));
+                return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+            }
+
             $('#form3').on('submit', function() {
-    var fd = new FormData(document.getElementById("form3"));
+            var fd = new FormData(document.getElementById("form3"));
+            var reply_content = document.getElementById('reply_content').value;
+            if(reply_content) {
+                $("#reply_content_class").removeClass('has-error');
+                $("#alert23").hide();
+            } else {
+                var message = "<li>{!! Lang::get('lang.reply_content_is_a_required_field') !!}</li>";
+                $("#reply_content_class").addClass('has-error');
+                $("#alert23").show();
+                $('#message-danger2').html(message);
+                $("#show3").hide();
+                $("#t1").show();
+                return false;
+            }
             $.ajax({
             type: "POST",
                     url: "../thread/reply/{{ $tickets->id }}",
@@ -1679,28 +1810,40 @@ if ($thread->title != "") {
                     processData: false, // tell jQuery not to process the data
                     contentType: false, // tell jQuery not to set contentType
                     beforeSend: function() {
-
+                        
                     $("#t1").hide();
                             $("#show3").show();
                     },
                     success: function(response) {
-
+                    if(response !== 1) {
+                        if(response === "file size exceeded") {
+                            alert(response);
+                        }
+                    }
                     if (response == 1)
                     {
-                    $("#refresh1").load("../thread/{{$tickets->id}}  #refresh1");
-                            // $("#t1").load("../thread/{{$tickets->id}}  #t1");
-                            var message = "{!! Lang::get('lang.you_have_successfully_replied_to_your_ticket') !!}";
-                            $("#alert21").show();
-                            $('#message-success2').html(message);
-                            setInterval(function(){$("#alert21").hide(); }, 4000);
-                            // var wysihtml5Editor = $('textarea').wysihtml5().data("wysihtml5").editor;
-                            $("#newtextarea").empty();
-                            var div = document.getElementById('newtextarea');
-                            div.innerHTML = div.innerHTML + '<textarea style="width:98%;height:200px;" name="reply_content" class="form-control" id="reply_content"/></textarea>';
-                            $("#newtextarea1").empty();
-                            var div1 = document.getElementById('newtextarea1');
-                            div1.innerHTML = div1.innerHTML + '<textarea style="width:98%;height:200px;" name="InternalContent" class="form-control" id="InternalContent"/></textarea>';
-                            var wysihtml5Editor = $('textarea').wysihtml5().data("wysihtml5").editor;
+                        $("#refresh1").load("../thread/{{$tickets->id}}  #refresh1");
+                        var message = "{{ Lang::get('lang.you_have_successfully_replied_to_your_ticket') }}";
+                        $("#alert21").show();
+                        $('#message-success2').html(message);
+                        setInterval(function(){$("#alert21").hide(); }, 4000);
+                        $("#newtextarea").empty();
+                        var div = document.getElementById('newtextarea');
+                        div.innerHTML = div.innerHTML + '<textarea style="width:98%;height:200px;" name="reply_content" class="form-control" id="reply_content"/></textarea>';
+                        $("#newtextarea1").empty();
+                        var div1 = document.getElementById('newtextarea1');
+                        div1.innerHTML = div1.innerHTML + '<textarea style="width:98%;height:200px;" name="InternalContent" class="form-control" id="InternalContent"/></textarea>';
+                        var wysihtml5Editor = $('textarea').wysihtml5().data("wysihtml5").editor;
+                        setInterval(function(){
+                            var head= document.getElementsByTagName('head')[0];
+                            var script= document.createElement('script');
+                            script.type= 'text/javascript';
+                            script.src= '{{asset("lb-faveo/js/jquery.rating.pack.js")}}';
+                            head.appendChild(script);
+//                            $('.rating-cancel').hide();
+//                            $(".star-rating-control").attr("disabled", "disabled").off('hover');
+//                            $(".star-rating-control").addClass("disabled")
+                        }, 4000);
                     } else {
                     // alert('fail');
                     // $( "#dismis4" ).trigger( "click" );
@@ -1709,8 +1852,12 @@ if ($thread->title != "") {
                             $('#message-danger2').html(message);
                             setInterval(function(){$("#alert23").hide(); }, 4000);
                     }
-                    $("#show3").hide();
-                            $("#t1").show();
+                        $("#show3").hide();
+                        $("#t1").show();
+                    },
+                    error: function(response) {
+                        $("#show3").hide();
+                        $("#t1").show();
                     }
             })
             return false;
@@ -1753,8 +1900,9 @@ if ($thread->title != "") {
             dataType: "html",
             data: $(this).serialize(),
             beforeSend: function() {
-            $('#show7').show();
-                    $('#hide1234').hide();
+                $('#here').html("");
+                $('#show7').show();
+                $('#hide1234').hide();
             },
             success: function(response) {
             $('#show7').hide();
@@ -1767,7 +1915,7 @@ if ($thread->title != "") {
                     // if(link) {
                     //     link.click();
                     // }
-                    $('#cc-close').trigger('click');
+//                    $('#cc-close').trigger('click');
                     }, 500);
             }
     })
@@ -1892,7 +2040,6 @@ if ($thread->title != "") {
                     $("#merge-succ-alert").show();
                     $('#message-merge-succ').html(message);
             }
-
             }
     })
             return false;

resources/views/themes/default1/agent/helpdesk/ticket/trash.blade.php

@@ -66,6 +66,7 @@ if (Auth::user()->role == 'agent') {
         <input type="submit" class="btn btn-default text-yellow btn-sm" name="submit"  id="hard-delete" value="{{Lang::get('lang.clean-up')}}" title="{{Lang::get('lang.trash-delete-title-msg')}}">
 
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages"  id="refresh">
             <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
             <!-- table -->

resources/views/themes/default1/agent/helpdesk/ticket/unassigned.blade.php

@@ -57,6 +57,7 @@ if (Auth::user()->role == 'agent') {
         <input type="submit" class="submit btn btn-default text-yellow btn-sm" id="close" name="submit" value="{!! Lang::get('lang.close') !!}">
         <button type="button" class="btn btn-sm btn-default text-green" id="Edit_Ticket" data-toggle="modal" data-target="#MergeTickets"><i class="fa fa-code-fork"> </i> {!! Lang::get('lang.merge') !!}</button>
         <!--</div>-->
+        <p><p/>
         <div class="mailbox-messages"  id="refresh">
             <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>{!! Lang::get('lang.loading') !!}...</b></p>
             <!-- table -->
@@ -71,37 +72,7 @@ if (Auth::user()->role == 'agent') {
             Lang::get('lang.assigned_to'),
             Lang::get('lang.last_activity'))
             ->setUrl(route('get.unassigned.ticket'))
-            ->setOptions('aoColumnDefs',array(
-            array(
-            'render' => "function ( data, type, row ) {
-            var t = row[6].split(/[- :,/ :,. /]/);
-            var d = new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
-            <!--  -->
-            var dtf= '$date_time_format';
-            if(dtf==1) {
-            dtf = 'D/MMM/YYYY hh:mm:ss A';
-            } else if(dtf==2) {
-            dtf = 'D MMM, YYYY hh:mm:ss A';
-            } else if(dtf==3) {
-            dtf = 'D-MMM-YYYY hh:mm:ss A';
-            } else if(dtf==4) {
-            dtf = 'MMM/D/YYYY hh:mm:ss A';
-            } else if(dtf==5) {
-            dtf = 'MMM D, YYYY hh:mm:ss A';
-            } else if(dtf==6) {
-            dtf = 'MMM-D-YYYY hh:mm:ss A';
-            } else if(dtf==7) {
-            dtf = 'YYYY/MMM/D hh:mm:ss A';
-            } else if(dtf==8) {
-            dtf = 'YYYY, MMM D hh:mm:ss A';
-            } else if(dtf==9) {
-            dtf = 'YYYY-MMM-D hh:mm:ss A';
-            }
-            return  moment(d).format(dtf);
-            <!-- //return d; -->
-            }", 
-            'aTargets' => array(6))
-            ))
+            
             ->setOrder(array(6=>'desc'))  
             ->setClass('table table-hover table-bordered table-striped')
             ->setCallbacks("fnRowCallback",'function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {

resources/views/themes/default1/agent/helpdesk/user/create.blade.php

@@ -12,19 +12,11 @@ active
 class="active"
 @stop
 
-@section('HeadInclude')
-@stop
 <!-- header -->
 @section('PageHeader')
 <h1>{!! Lang::get('lang.create_user') !!}</h1>
 @stop
 <!-- /header -->
-<!-- breadcrumbs -->
-@section('breadcrumbs')
-<ol class="breadcrumb">
-</ol>
-@stop
-<!-- /breadcrumbs -->
 <!-- content -->
 @section('content')
 @if(Session::has('fails'))
@@ -50,48 +42,62 @@ class="active"
             <b>{!! Lang::get('lang.alert') !!}!</b>
             <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
             <br/>
-            @if($errors->first('email'))
-            <li class="error-message-padding">{!! $errors->first('email', ':message') !!}</li>
+            @if($errors->first('first_name'))
+                <li class="error-message-padding">{!! $errors->first('first_name', ':message') !!}</li>
             @endif
-            @if($errors->first('full_name'))
-            <li class="error-message-padding">{!! $errors->first('full_name', ':message') !!}</li>
+            @if($errors->first('last_name'))
+                <li class="error-message-padding">{!! $errors->first('last_name', ':message') !!}</li>
+            @endif
+            @if($errors->first('user_name'))
+                <li class="error-message-padding">{!! $errors->first('user_name', ':message') !!}</li>
+            @endif
+            @if($errors->first('email'))
+                <li class="error-message-padding">{!! $errors->first('email', ':message') !!}</li>
             @endif
             @if($errors->first('mobile'))
-            <li class="error-message-padding">{!! $errors->first('mobile', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('mobile', ':message') !!}</li>
             @endif
             @if($errors->first('ext'))
-            <li class="error-message-padding">{!! $errors->first('ext', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('ext', ':message') !!}</li>
             @endif
             @if($errors->first('phone_number'))
-            <li class="error-message-padding">{!! $errors->first('phone_number', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('phone_number', ':message') !!}</li>
             @endif
             @if($errors->first('active'))
-            <li class="error-message-padding">{!! $errors->first('active', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('active', ':message') !!}</li>
             @endif
         </div>
-        @endif
-        <!-- Email Address : Email : Required -->
+        @endif        
         <div class="row">
-            <div class="col-xs-4 form-group {{ $errors->has('email') ? 'has-error' : '' }}">
+            <!-- First name : first name : Required -->
+            <div class="col-xs-3 form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
+                {!! Form::label('first_name',Lang::get('lang.first_name')) !!}<span class="text-red"> *</span>
+                {!! Form::text('first_name',null,['class' => 'form-control']) !!}
+            </div>
+            <!-- Last name : last name : Required -->
+            <div class="col-xs-3 form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
+                {!! Form::label('last_name',Lang::get('lang.last_name')) !!}
+                {!! Form::text('last_name',null,['class' => 'form-control']) !!}
+            </div>
+            <!-- User Name : Text : Required-->
+            <div class="col-xs-3 form-group {{ $errors->has('user_name') ? 'has-error' : '' }}">
+                {!! Form::label('user_name',Lang::get('lang.user_name')) !!}<span class="text-red"> *</span>
+                {!! Form::text('user_name',null,['class' => 'form-control']) !!}
+            </div>
+            <!-- Email Address : Email : Required -->
+            <div class="col-xs-3 form-group {{ $errors->has('email') ? 'has-error' : '' }}">
                 {!! Form::label('email',Lang::get('lang.email')) !!}<span class="text-red"> *</span>
                 {!! Form::email('email',null,['class' => 'form-control']) !!}
             </div>
-            <!-- Full Name : Text : Required-->
-            <div class="col-xs-4 form-group {{ $errors->has('full_name') ? 'has-error' : '' }}">
-                {!! Form::label('full_name',Lang::get('lang.full_name')) !!}<span class="text-red"> *</span>
-                {!! Form::text('full_name',null,['class' => 'form-control']) !!}
-            </div>
-            <!-- mobile Number : Text :  -->
-            <div class="col-md-4 form-group {{ $errors->has('mobile') ? 'has-error' : '' }}">
-                {!! Form::label('mobile',Lang::get('lang.mobile')) !!}
-                {!! Form::text('mobile',null,['class' => 'form-control']) !!}
-            </div>
             <div class="col-xs-1 form-group {{ Session::has('country_code_error') ? 'has-error' : '' }}">
-
                 {!! Form::label('country_code',Lang::get('lang.country-code')) !!}
                 {!! $errors->first('country_code', '<spam class="help-block">:message</spam>') !!}
                 {!! Form::text('country_code',null,['class' => 'form-control', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code')]) !!}
-
+            </div>
+            <!-- mobile Number : Text :  -->
+            <div class="col-md-3 form-group {{ $errors->has('mobile') ? 'has-error' : '' }}">
+                {!! Form::label('mobile',Lang::get('lang.mobile')) !!}
+                {!! Form::text('mobile',null,['class' => 'form-control']) !!}
             </div>
             <div class="col-xs-1 form-group {{ $errors->has('ext') ? 'has-error' : '' }}">
                 <label for="ext">{!! Lang::get('lang.ext') !!}</label>  
@@ -101,13 +107,13 @@ class="active"
                 <label for="phone_number">{!! Lang::get('lang.phone') !!}</label>
                 {!! Form::text('phone_number',null,['class' => 'form-control']) !!}
             </div>
-            <div class="col-md-4 form-group {{ $errors->has('active') ? 'has-error' : '' }}">
+            <div class="col-md-3 form-group {{ $errors->has('active') ? 'has-error' : '' }}">
                 {!! Form::label('active',Lang::get('lang.status')) !!}
                 <div class="row">
-                    <div class="col-xs-12">
+                    <div class="col-xs-4">
                         {!! Form::radio('active','1',true) !!} {{Lang::get('lang.active')}}
                     </div>
-                    <div class="col-xs-12">
+                    <div class="col-xs-6">
                         {!! Form::radio('active','0') !!} {{Lang::get('lang.inactive')}}
                     </div>
                 </div>
@@ -118,15 +124,26 @@ class="active"
             {!! Form::label('internal_note',Lang::get('lang.internal_notes')) !!}
             {!! Form::textarea('internal_note',null,['class' => 'form-control', 'size' => '30x5']) !!}
         </div>
+        <!-- Send email to user about registration password -->
+        <div class="form-group">
+            <input type="checkbox" name="send_email" checked> &nbsp;<label> {{ Lang::get('lang.send_password_via_email')}}</label>
+        </div>
     </div>
     <div class="box-footer">
         {!! Form::submit(Lang::get('lang.submit'),['class'=>'form-group btn btn-primary'])!!}
     </div>
 </div>
-
 <script>
     $(function() {
         $("textarea").wysihtml5();
-    });
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
 </script>
 @stop

resources/views/themes/default1/agent/helpdesk/user/edit.blade.php

@@ -44,49 +44,63 @@ class="active"
             <b>{!! Lang::get('lang.alert') !!}!</b>
             <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
             <br/>
-            @if($errors->first('email'))
-            <li class="error-message-padding">{!! $errors->first('email', ':message') !!}</li>
+            @if($errors->first('first_name'))
+                <li class="error-message-padding">{!! $errors->first('first_name', ':message') !!}</li>
+            @endif
+            @if($errors->first('last_name'))
+                <li class="error-message-padding">{!! $errors->first('last_name', ':message') !!}</li>
             @endif
             @if($errors->first('user_name'))
-            <li class="error-message-padding">{!! $errors->first('user_name', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('user_name', ':message') !!}</li>
+            @endif
+            @if($errors->first('email'))
+                <li class="error-message-padding">{!! $errors->first('email', ':message') !!}</li>
             @endif
             @if($errors->first('mobile'))
-            <li class="error-message-padding">{!! $errors->first('mobile', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('mobile', ':message') !!}</li>
             @endif
             @if($errors->first('ext'))
-            <li class="error-message-padding">{!! $errors->first('ext', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('ext', ':message') !!}</li>
             @endif
             @if($errors->first('phone_number'))
-            <li class="error-message-padding">{!! $errors->first('phone_number', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('phone_number', ':message') !!}</li>
             @endif
             @if($errors->first('active'))
-            <li class="error-message-padding">{!! $errors->first('active', ':message') !!}</li>
+                <li class="error-message-padding">{!! $errors->first('active', ':message') !!}</li>
             @endif
         </div>
         @endif
         <!-- Email Address : Email : Required -->
         <div class="row">
-            <div class="col-md-4 form-group {{ $errors->has('email') ? 'has-error' : '' }}">
-                {!! Form::label('email',Lang::get('lang.email')) !!} <span class="text-red"> *</span>
-                {!! Form::email('email',null,['class' => 'form-control']) !!}
+            <!-- First name : first name : Required -->
+            <div class="col-xs-3 form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
+                {!! Form::label('first_name',Lang::get('lang.first_name')) !!}<span class="text-red"> *</span>
+                {!! Form::text('first_name',null,['class' => 'form-control']) !!}
             </div>
-            <!-- Full Name : Text : Required-->
-            <div class="col-md-4 form-group {{ $errors->has('user_name') ? 'has-error' : '' }}">
-                {!! Form::label('user_name',Lang::get('lang.full_name')) !!} <span class="text-red"> *</span>
+            <!-- Last name : last name : Required -->
+            <div class="col-xs-3 form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
+                {!! Form::label('last_name',Lang::get('lang.last_name')) !!}
+                {!! Form::text('last_name',null,['class' => 'form-control']) !!}
+            </div>
+            <!-- User Name : Text : Required-->
+            <div class="col-xs-3 form-group {{ $errors->has('user_name') ? 'has-error' : '' }}">
+                {!! Form::label('user_name',Lang::get('lang.user_name')) !!}<span class="text-red"> *</span>
                 {!! Form::text('user_name',null,['class' => 'form-control']) !!}
             </div>
-            <!-- mobile Number : Text :  -->
-            <div class="col-md-4 form-group {{ $errors->has('mobile') ? 'has-error' : '' }}">
-                {!! Form::label('mobile',Lang::get('lang.mobile')) !!}
-                {!! Form::text('mobile',null,['class' => 'form-control']) !!}
-            </div>
+            <div class="col-md-3 form-group {{ $errors->has('email') ? 'has-error' : '' }}">
+                {!! Form::label('email',Lang::get('lang.email')) !!} <span class="text-red"> *</span>
+                {!! Form::email('email',null,['class' => 'form-control']) !!}
+            </div>            
             <div class="col-xs-1 form-group {{ Session::has('country_code_error') ? 'has-error' : '' }}">
-
                 {!! Form::label('country_code',Lang::get('lang.country-code')) !!}
                 {!! $errors->first('country_code', '<spam class="help-block">:message</spam>') !!}
                 {!! Form::text('country_code',null,['class' => 'form-control', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code')]) !!}
-
             </div>
+            <!-- mobile Number : Text :  -->
+            <div class="col-md-3 form-group {{ $errors->has('mobile') ? 'has-error' : '' }}">
+                {!! Form::label('mobile',Lang::get('lang.mobile')) !!}
+                {!! Form::text('mobile',null,['class' => 'form-control']) !!}
+            </div>           
             <div class="col-xs-1 form-group {{ $errors->has('ext') ? 'has-error' : '' }}">
                 <label for="ext">{!! Lang::get('lang.ext') !!}</label>  
                 {!! Form::text('ext',null,['class' => 'form-control']) !!}
@@ -95,7 +109,7 @@ class="active"
                 <label for="phone_number">{!! Lang::get('lang.phone') !!}</label>
                 {!! Form::text('phone_number',null,['class' => 'form-control']) !!}
             </div>
-            <div class="col-xs-3 form-group {{ $errors->has('active') ? 'has-error' : '' }}">
+            <div class="col-xs-2 form-group {{ $errors->has('active') ? 'has-error' : '' }}">
                 {!! Form::label('active',Lang::get('lang.status')) !!}
                 <div class="row">
                     <div class="col-xs-12">
@@ -106,7 +120,7 @@ class="active"
                     </div>
                 </div>
             </div>
-            <div class="col-xs-3 form-group {{ $errors->has('ban') ? 'has-error' : '' }}">
+            <div class="col-xs-2 form-group {{ $errors->has('ban') ? 'has-error' : '' }}">
                 {!! Form::label('ban',Lang::get('lang.ban')) !!}
                 <div class="row">
                     <div class="col-xs-12">
@@ -121,16 +135,24 @@ class="active"
         <!-- Internal Notes : Textarea -->
         <div class="form-group">
             {!! Form::label('internal_note',Lang::get('lang.internal_notes')) !!}
-            {!! Form::textarea('internal_note',null,['class' => 'form-control']) !!}
+            {!! Form::textarea('internal_note',null,['class' => 'form-control', 'size' => '30x5']) !!}
         </div>
     </div>
     <div class="box-footer">
-        {!! Form::submit(Lang::get('lang.save'),['class'=>'form-group btn btn-primary'])!!}
+        {!! Form::submit(Lang::get('lang.update'),['class'=>'form-group btn btn-primary'])!!}
     </div>        
 </div>
 <script>
     $(function() {
         $("textarea").wysihtml5();
-    });
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
 </script>
 @stop

resources/views/themes/default1/agent/helpdesk/user/index.blade.php

@@ -42,6 +42,14 @@ class="active"
         </div>
         @endif
         <!-- failure message -->
+        @if(Session::has('warning'))
+        <div class="alert alert-warning alert-dismissable">
+            <i class="fa fa-ban"></i><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <b>{!! Lang::get('lang.alert') !!} !</b>            
+            {{Session::get('warning')}}
+        </div>
+        @endif
+        <!-- failure message -->
         @if(Session::has('fails'))
         <div class="alert alert-danger alert-dismissable">
             <i class="fa fa-ban"></i><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>

resources/views/themes/default1/agent/helpdesk/user/profile-edit.blade.php

@@ -127,7 +127,7 @@ class="active"
                 {!! Form::close() !!}
             </div>
             <div class="box-footer">
-                {!! Form::submit(Lang::get('lang.submit'),['class'=>'form-group btn btn-primary'])!!}
+                {!! Form::submit(Lang::get('lang.update'),['class'=>'form-group btn btn-primary'])!!}
             </div>
         </div>
     </div>
@@ -178,7 +178,7 @@ class="active"
                 </div>
             </div>
             <div class="box-footer">
-                {!! Form::submit(Lang::get('lang.save'),['class'=>'form-group btn btn-primary'])!!}
+                {!! Form::submit(Lang::get('lang.update'),['class'=>'form-group btn btn-primary'])!!}
             </div>
         </div>
     </div>

resources/views/themes/default1/agent/helpdesk/user/profile.blade.php

@@ -82,10 +82,10 @@ class="active"
                     <div class='col-xs-4'><label>{!! Lang::get('lang.group') !!}:</label></div> <div class='col-xs-7'> {{ $grp }}</div>
                 </div>
                 <div class="form-group  row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.company') !!}:</label></div> <div class='col-xs-7'> {{ $user->role }}</div>
+                    <div class='col-xs-4'><label>{!! Lang::get('lang.company') !!}:</label></div> <div class='col-xs-7'> {{ $user->company }}</div>
                 </div>
                 <div class="form-group  row">
-                    <div class='col-xs-4'><label>{!! Lang::get('lang.role') !!}:</label></div> <div class='col-xs-7'> {{ $user->company }}</div>
+                    <div class='col-xs-4'><label>{!! Lang::get('lang.role') !!}:</label></div> <div class='col-xs-7'>  {{ $user->role }}</div>
                 </div>
             </div>
         </div>

resources/views/themes/default1/agent/helpdesk/user/show.blade.php

@@ -64,6 +64,14 @@ class="active"
                     </center>
                 </div>
             </div>
+            @if($users->user_name)
+                <div class="box-footer">
+                    <b>{{Lang::get('lang.user_name')}}</b>
+                    <a class="pull-right" href="{{route('user.show', $users->id)}}">
+                        {{$users->user_name }}
+                    </a>
+                </div>
+            @endif
             <div class="box-footer">
                 <b>{{Lang::get('lang.email')}}</b>
                 <a class="pull-right" href="{{route('user.show', $users->id)}}">
@@ -118,12 +126,30 @@ class="active"
                     <span style="color:red;">{!! Lang::get('lang.inactive') !!}</span>
                     @endif
                 </a>
-            </div>
+            </div>            
+            @if($users->country_code)
+                <div class="box-footer">
+                    <b>{{Lang::get('lang.country_code')}}</b>
+                    <a class="pull-right"> {{$users->country_code}}</a>
+                </div>
+            @endif
+            @if($users->ext)
+                <div class="box-footer">
+                    <b>{{Lang::get('lang.ext')}}</b>
+                    <a class="pull-right"> {{$users->ext}}</a>
+                </div>
+            @endif
+            @if($users->mobile)
+                <div class="box-footer">
+                    <b>{{Lang::get('lang.mobile')}}</b>
+                    <a class="pull-right"> {{$users->mobile}}</a>
+                </div>
+            @endif
             @if($users->phone_number)
-            <div class="box-footer">
-                <b>{{Lang::get('lang.phone')}}</b>
-                <a class="pull-right">{{$users->phone_number}}</a>
-            </div>
+                <div class="box-footer">
+                    <b>{{Lang::get('lang.phone')}}</b>
+                    <a class="pull-right"> {{$users->phone_number}}</a>
+                </div>
             @endif
             @if($users->internal_note)
             <div class="box-footer">
@@ -252,7 +278,7 @@ class="active"
                                                     @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
                                                 <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
                                                 <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first(); ?>
-                                                <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
+                                                <td class="mailbox-priority">@if($priority != null)<spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam>@endif</td>
                                         <?php $from = App\User::where('id', '=', $ticket->user_id)->first(); ?> 
                                         <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
                                         <td>{!! $assigned !!}</td>
@@ -370,7 +396,7 @@ class="active"
                                                     @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
                                                 <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
                                                 <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first(); ?>
-                                                <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
+                                                <td class="mailbox-priority">@if($priority != null)<spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam>@endif</td>
                                         <?php $from = App\User::where('id', '=', $ticket->user_id)->first(); ?> 
                                         <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
                                         <td>{!! $assigned !!}</td>
@@ -492,7 +518,7 @@ class="active"
                                                     @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
                                                 <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
                                                 <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first(); ?>
-                                                <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
+                                                <td class="mailbox-priority">@if($priority != null)<spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam>@endif</td>
                                         <?php $from = App\User::where('id', '=', $ticket->user_id)->first(); ?> 
                                         <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
                                         <td>{!! $assigned !!}</td>

resources/views/themes/default1/agent/helpdesk/user/show2.blade.php

@@ -1,740 +0,0 @@
-@extends('themes.default1.agent.layout.agent')
-
-@section('Users')
-class="active"
-@stop
-
-@section('user-bar')
-active
-@stop
-
-@section('user')
-class="active"
-@stop
-
-@section('HeadInclude')
-@stop
-<!-- header -->
-@section('PageHeader')
-<h1>{!! Lang::get('lang.user_profile') !!} <a href="{{route('user.edit', $users->id)}}" class="btn btn-info btn-sm btn-flat pull-right"><i class="fa fa-edit" style="color:black;"> </i> {!! Lang::get('lang.edit') !!}</a></h1>
-@stop
-<!-- /header -->
-<!-- breadcrumbs -->
-@section('breadcrumbs')
-
-@stop
-<!-- /breadcrumbs -->
-<!-- content -->
-@section('content')
-<!-- success message -->
-	<div id="alert-success" class="alert alert-success alert-dismissable" style="display:none;">
-		<i class="fa  fa-check-circle"> </i> <b> Success <span id="get-success"></span></b>
-		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-	</div>
-<div class="row">
-	<div class="col-md-3">
-		<div class="box box-primary">	
-			<div class="box-header">
-			</div>
-			<div class="box-body ">
-				<div>
-					<center>
-						<img src="{{ Gravatar::src($users -> email) }}" class="img-circle" alt="User Image" style="border:3px solid #CBCBDA;padding:3px;">	
-						@if($users->first_name || $users->last_name)
-							<h3 class="">{{$users->first_name}} {{$users->last_name}}</h3>
-						@else
-							<h3 class="">{{$users->user_name}}</h3>
-						@endif
-					</center>
-				</div>
-			</div>
-			<div class="box-footer">
-				<b>{{Lang::get('lang.email')}}</b>
-				<a class="pull-right">
-					{{$users->email }}
-				</a>
-			</div>
-			<div class="box-footer">
-					<div id="refresh-org">
-					<?php
-						$user_org = App\Model\helpdesk\Agent_panel\User_org::where('user_id','=', $users->id)->first();
-					?>
-						@if($user_org == null)
-						<b>{!! Lang::get('lang.organization') !!}</b>
-
-							<a href="" class="pull-right"  data-toggle="modal" data-target="#assign"><i class="fa fa-hand-o-right" style="color:orange;"> </i> {!! Lang::get('lang.assign') !!} </a>
-							<a href="" data-toggle="modal" data-target="#create_org" class="pull-right"> {{Lang::get('lang.create')}} <b style="color:#000"> / </b>&nbsp; </a>
-						@else
-		<?php 	$org_id = $user_org->org_id;
-				$organization = App\Model\helpdesk\Agent_panel\Organization::where('id','=',$org_id)->first(); ?>
-						<b>{!! Lang::get('lang.organization') !!}</b>
-							<a href="{!! URL::route('organizations.show',$organization->id) !!}" class="pull-right">{!! $organization->name !!}</a>
-						@endif
-					
-					</div>
-			</div>
-			
-			<div class="box-footer">
-				<b>{{Lang::get('lang.status')}}</b>
-				<a class="pull-right">
-					@if($users->active == '1')
-					 <span style="color:green;">{!! Lang::get('lang.active') !!}</span>
-					@else
-					 <span style="color:red;">{!! Lang::get('lang.inactive') !!}</span>
-					@endif
-				</a>
-			</div>
-			@if($users->phone_number)
-				<div class="box-footer">
-			        <b>{{Lang::get('lang.phone')}}</b>
-			        <a class="pull-right">{{$users->phone_number}}</a>
-		        </div>
-		    @endif
-		    @if($users->internal_note)
-				<div class="box-footer">
-			        <b>{{Lang::get('lang.internal_notes')}}</b>
-			        <br/>
-			        {!! $users->internal_note !!}
-		        </div>
-		    @endif
-		</div>
-	</div>
-	<div class="col-md-9">
-{{-- detals table starts --}}
-<?php $user = App\User::where('id',$users->id)->first(); ?>
-<?php $open = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','1')->get());
-$counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','2')->get());
-$deleted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','5')->get()); ?>
-          <div class="row">
-            <div class="col-md-12">
-              <!-- Custom Tabs -->
-              <div class="nav-tabs-custom">
-                <ul class="nav nav-tabs">
-                  <li class="active"><a href="#tab_1" data-toggle="tab">{!! Lang::get('lang.open_tickets') !!} ({{$open}})</a></li>
-                  <li><a href="#tab_2" data-toggle="tab">{!! Lang::get('lang.closed_tickets') !!} ({{$counted}})</a></li>
-                  <li><a href="#tab_3" data-toggle="tab">{!! Lang::get('lang.deleted_tickets') !!} ({{$deleted}})</a></li>
-                </ul>
-                <div class="tab-content">
-                  <div class="tab-pane active" id="tab_1">
-                    {{-- open tab --}}
-						    <?php $open = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','1')->get()); ?>
-						      
-						        @if(Session::has('success'))
-						        <div id="success-alert" class="alert alert-success alert-dismissable">
-						            <i class="fa  fa-check-circle"> </i> <b> Success </b>
-						            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						            {{Session::get('success')}}
-						        </div>
-						        @endif
-						        <!-- failure message -->
-						        @if(Session::has('fails'))
-						        <div class="alert alert-danger alert-dismissable">
-						            <i class="fa fa-ban"> </i> <b> Alert! </b>
-						            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						            {{Session::get('fails')}}
-						        </div>
-						        @endif
-						    <div class="box-body no-padding ">
-						        
-						    {!! Form::open(['route'=>'select_all','method'=>'post']) !!}
-						        <div class="mailbox-controls">
-						            <!-- Check all button -->
-						            <a class="btn btn-default btn-sm checkbox-toggle"><i class="fa fa-square-o"></i></a>
-						            <a class="btn btn-default btn-sm" id="click"><i class="fa fa-refresh"></i></a>
-						            <input type="submit" class="btn btn-default text-orange btn-sm" name="submit" value="{!! Lang::get('lang.delete') !!}">
-						            <input type="submit" class="btn btn-default text-yellow btn-sm" name="submit" value="{!! Lang::get('lang.close') !!}">
-						            <div class="pull-right">
-						                <?php
-						$counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','1')->get());
-						if ($counted < 20) {
-							echo $counted . "/" . $counted;
-						} else {
-							echo "20/" . $counted;
-						}
-						?>
-						            </div>
-						        </div>
-						        <div class=" table-responsive mailbox-messages" id="refresh">
-						        <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>Loading...</b></p>
-						        <!-- table -->
-						            <table class="table table-hover table-striped">
-						                <thead>
-						                <th>
-						                </th>
-						                <th>{!! Lang::get('lang.subject') !!}</th>
-						                <th>{!! Lang::get('lang.ticket_id') !!}</th>
-						                <th>{!! Lang::get('lang.priority') !!}</th>
-						                <th>{!! Lang::get('lang.last_replier') !!}</th>
-						                <th>{!! Lang::get('lang.assigned_to') !!}</th>
-						                <th>{!! Lang::get('lang.last_activity') !!}</th>
-						                </thead>
-						                <tbody id="hello">
-						                    <?php $tickets = App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','1')->orderBy('id', 'DESC')->paginate(20);?>
-						                    @foreach ($tickets  as $ticket)
-						                    <tr <?php if ($ticket->seen_by == null) {?> style="color:green;" <?php }
-						?> >
-						                        <td ><input type="checkbox" class="icheckbox_flat-blue" name="select_all[]" value="{{$ticket->id}}"/></td>
-						                        <?php 
-						                        //  collaborators
-						                        $collaborators = App\Model\helpdesk\Ticket\Ticket_Collaborator::where('ticket_id','=',$ticket->id)->get();
-						                        $collab = count($collaborators);
-						                        //  title
-						                        $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
-						                        $string = strip_tags($title->title);
-						                        // check atatchments
-						                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id','=',$title->id)->first();
-						                        $attach = count($attachments);
-
-						                        if (strlen($string) > 40) {
-						                            $stringCut = substr($string, 0, 40);
-						                            $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; 
-						                        }
-						                        $TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
-						                        $TicketDatarow = App\Model\helpdesk\Ticket\Ticket_Thread::where('id', '=', $TicketData)->first();
-						                        $LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first(); 
-						                        if($LastResponse->role == "user") {
-						                            $rep = "#F39C12";
-						                            $username = $LastResponse->user_name;
-						                            } else { $rep = "#000"; $username = $LastResponse->first_name ." ". $LastResponse->last_name; 
-						                            if($LastResponse->first_name==null || $LastResponse->last_name==null) {
-						                                $username = $LastResponse->user_name;
-						                            }}   
-						                        $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
-						                        $count = count($titles);
-						                        foreach($titles as $title) {
-						                            $title = $title;
-						                        }  
-						                        $assigned_to = App\User::where('id','=',$ticket->assigned_to)->first();
-						                        if($assigned_to == null) {
-						                            $assigned = "Unassigned";
-						                        } else {
-						                            $assigned = $assigned_to->first_name ." ". $assigned_to->last_name;
-						                        }
-						                        ?>
-						                        <td class="mailbox-name"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">{{$string}}   </a> ({!! $count!!}) <i class="fa fa-comment"></i>
-						                        @if($collab > 0)&nbsp;<i class="fa fa-users"></i>@endif 
-						                        @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
-						                        <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
-						                        <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first();?>
-						                        <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
-						                        <?php $from = App\User::where('id','=',$ticket->user_id)->first();   ?> 
-						                <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
-						                <td>{!! $assigned !!}</td>
-						                <td class="mailbox-last-activity">{!! UTC::usertimezone($title->updated_at) !!}</td>
-						                </tr>
-						                @endforeach
-						                </tbody>
-						            </table><!-- /.table -->
-						            <div class="pull-right">
-						                <?php echo $tickets->setPath(url('/ticket/open'))->render();?>&nbsp;
-						            </div>
-						        </div><!-- /.mail-box-messages -->
-						        {!! Form::close() !!}
-
-                   {{-- end deleted tickets --}}
-                   </div>
-                  </div><!-- /.tab-pane -->
-                  <div class="tab-pane" id="tab_2">
-                    {{-- open tab --}}
-						    <?php $closed = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', 2)->get()); ?>
-						        @if(Session::has('success'))
-						        <div id="success-alert" class="alert alert-success alert-dismissable">
-						            <i class="fa  fa-check-circle"> </i> <b> Success </b>
-						            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						            {{Session::get('success')}}
-						        </div>
-						        @endif
-						        <!-- failure message -->
-						        @if(Session::has('fails'))
-						        <div class="alert alert-danger alert-dismissable">
-						            <i class="fa fa-ban"> </i> <b> Alert! </b>
-						            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						            {{Session::get('fails')}}
-						        </div>
-						        @endif
-						    <div class="box-body no-padding">
-						    {!! Form::open(['route'=>'select_all','method'=>'post']) !!}
-						        <div class="mailbox-controls">
-						            <!-- Check all button -->
-						            <a class="btn btn-default btn-sm checkbox-toggle"><i class="fa fa-square-o"></i></a>
-						            <a class="btn btn-default btn-sm" id="click"><i class="fa fa-refresh"></i></a>
-						            <input type="submit" class="btn btn-default text-orange btn-sm" name="submit" value="{!! Lang::get('lang.delete') !!}">
-						            <input type="submit" class="btn btn-default text-yellow btn-sm" name="submit" value="{!! Lang::get('lang.close') !!}">
-						            <div class="pull-right">
-						                <?php
-						$counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','2')->get());
-						if ($counted < 20) {
-							echo $counted . "/" . $counted;
-						} else {
-							echo "20/" . $counted;
-						}
-						?>
-						            </div>
-						        </div>
-						        <div class=" table-responsive mailbox-messages" id="refresh">
-						        <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>Loading...</b></p>
-						        <!-- table -->
-						            <table class="table table-hover table-striped">
-						                <thead>
-						                <th>
-						                </th>
-						                <th>{!! Lang::get('lang.subject') !!}</th>
-						                <th>{!! Lang::get('lang.ticket_id') !!}</th>
-						                <th>{!! Lang::get('lang.priority') !!}</th>
-						                <th>{!! Lang::get('lang.last_replier') !!}</th>
-						                <th>{!! Lang::get('lang.assigned_to') !!}</th>
-						                <th>{!! Lang::get('lang.last_activity') !!}</th>
-						                </thead>
-						                <tbody id="hello">
-						                    <?php $tickets = App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','2')->orderBy('id', 'DESC')->paginate(20);?>
-						                    @foreach ($tickets  as $ticket)
-						                    <tr <?php if ($ticket->seen_by == null) {?> style="color:green;" <?php } ?> >
-						                        <td ><input type="checkbox" class="icheckbox_flat-blue" name="select_all[]" value="{{$ticket->id}}"/></td>
-						                        <?php 
-						                        //  collaborators
-						                        $collaborators = App\Model\helpdesk\Ticket\Ticket_Collaborator::where('ticket_id','=',$ticket->id)->get();
-						                        $collab = count($collaborators);
-						                        //  title
-						                        $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
-						                        $string = strip_tags($title->title);
-						                        // check atatchments
-						                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id','=',$title->id)->first();
-						                        $attach = count($attachments);
-
-						                        if (strlen($string) > 40) {
-						                            $stringCut = substr($string, 0, 40);
-						                            $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; 
-						                        }
-						                        $TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
-						                        $TicketDatarow = App\Model\helpdesk\Ticket\Ticket_Thread::where('id', '=', $TicketData)->first();
-						                        $LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first(); 
-						                        if($LastResponse->role == "user") {
-						                            $rep = "#F39C12";
-						                            $username = $LastResponse->user_name;
-						                            } else { $rep = "#000"; $username = $LastResponse->first_name ." ". $LastResponse->last_name; 
-						                            if($LastResponse->first_name==null || $LastResponse->last_name==null) {
-						                                $username = $LastResponse->user_name;
-						                            }}   
-						                        $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
-						                        $count = count($titles);
-						                        foreach($titles as $title) {
-						                            $title = $title;
-						                        }  
-						                        $assigned_to = App\User::where('id','=',$ticket->assigned_to)->first();
-						                        if($assigned_to == null) {
-						                            $assigned = "Unassigned";
-						                        } else {
-						                            $assigned = $assigned_to->first_name ." ". $assigned_to->last_name;
-						                        }
-						                        ?>
-						                        <td class="mailbox-name"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">{{$string}}   </a> ({!! $count!!}) <i class="fa fa-comment"></i>
-						                        @if($collab > 0)&nbsp;<i class="fa fa-users"></i>@endif 
-						                        @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
-						                        <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
-						                        <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first();?>
-						                        <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
-						                        <?php $from = App\User::where('id','=',$ticket->user_id)->first();   ?> 
-						                <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
-						                <td>{!! $assigned !!}</td>
-						                <td class="mailbox-last-activity">{!! UTC::usertimezone($title->updated_at) !!}</td>
-						                </tr>
-						                @endforeach
-						                </tbody>
-						            </table><!-- /.table -->
-						            
-						            <div class="pull-right">
-						                <?php echo $tickets->setPath(url('/ticket/open'))->render();?>&nbsp;
-						            </div>
-						        </div><!-- /.mail-box-messages -->
-						        {!! Form::close() !!}
-
-                   {{-- end deleted tickets --}}
-                   </div>
-                   </div>
-                  <div class="tab-pane" id="tab_3">
-                    {{-- open tab --}}
-						    <?php $deleted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','5')->get()); ?>
-						       
-						        @if(Session::has('success'))
-						        <div id="success-alert" class="alert alert-success alert-dismissable">
-						            <i class="fa  fa-check-circle"> </i> <b> Success </b>
-						            <button type="button" id="close-alert" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						            {{Session::get('success')}}
-						        </div>
-						        @endif
-						        <!-- failure message -->
-						        @if(Session::has('fails'))
-						        <div class="alert alert-danger alert-dismissable">
-						            <i class="fa fa-ban"> </i> <b> Alert! </b>
-						            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						            {{Session::get('fails')}}
-						        </div>
-						        @endif
-						    <div class="box-body no-padding ">
-						        
-						    {!! Form::open(['route'=>'select_all','method'=>'post']) !!}
-						        <div class="mailbox-controls">
-						            <!-- Check all button -->
-						            <a class="btn btn-default btn-sm checkbox-toggle"><i class="fa fa-square-o"></i></a>
-						            <a class="btn btn-default btn-sm" id="click"><i class="fa fa-refresh"></i></a>
-						            <input type="submit" class="btn btn-default text-orange btn-sm" name="submit" value="{!! Lang::get('lang.delete') !!}">
-						            <input type="submit" class="btn btn-default text-yellow btn-sm" name="submit" value="{!! Lang::get('lang.close') !!}">
-						            <div class="pull-right">
-						                <?php
-						$counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','5')->get());
-						if ($counted < 20) {
-							echo $counted . "/" . $counted;
-						} else {
-							echo "20/" . $counted;
-						}
-						?>
-						            </div>
-						        </div>
-						        <div class=" table-responsive mailbox-messages" id="refresh">
-						        <p style="display:none;text-align:center; position:fixed; margin-left:40%;margin-top:-70px;" id="show" class="text-red"><b>Loading...</b></p>
-						        <!-- table -->
-						            <table class="table table-hover table-striped">
-						                <thead>
-						                <th>
-						                </th>
-						              	<th>{!! Lang::get('lang.subject') !!}</th>
-						                <th>{!! Lang::get('lang.ticket_id') !!}</th>
-						                <th>{!! Lang::get('lang.priority') !!}</th>
-						                <th>{!! Lang::get('lang.last_replier') !!}</th>
-						                <th>{!! Lang::get('lang.assigned_to') !!}</th>
-						                <th>{!! Lang::get('lang.last_activity') !!}</th>
-						                </thead>
-						                <tbody id="hello">
-						                    <?php $tickets = App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=','5')->orderBy('id', 'DESC')->paginate(20);?>
-						                    @foreach ($tickets  as $ticket)
-						                    <tr <?php if ($ticket->seen_by == null) {?> style="color:green;" <?php }
-						?> >
-						                        <td ><input type="checkbox" class="icheckbox_flat-blue" name="select_all[]" value="{{$ticket->id}}"/></td>
-						                        <?php 
-						                        //  collaborators
-						                        $collaborators = App\Model\helpdesk\Ticket\Ticket_Collaborator::where('ticket_id','=',$ticket->id)->get();
-						                        $collab = count($collaborators);
-						                        //  title
-						                        $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
-						                        $string = strip_tags($title->title);
-						                        // check atatchments
-						                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id','=',$title->id)->first();
-						                        $attach = count($attachments);
-
-						                        if (strlen($string) > 40) {
-						                            $stringCut = substr($string, 0, 40);
-						                            $string = substr($stringCut, 0, strrpos($stringCut, ' ')).' ...'; 
-						                        }
-						                        $TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
-						                        $TicketDatarow = App\Model\helpdesk\Ticket\Ticket_Thread::where('id', '=', $TicketData)->first();
-						                        $LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first(); 
-						                        if($LastResponse->role == "user") {
-						                            $rep = "#F39C12";
-						                            $username = $LastResponse->user_name;
-						                            } else { $rep = "#000"; $username = $LastResponse->first_name ." ". $LastResponse->last_name; 
-						                            if($LastResponse->first_name==null || $LastResponse->last_name==null) {
-						                                $username = $LastResponse->user_name;
-						                            }}   
-						                        $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
-						                        $count = count($titles);
-						                        foreach($titles as $title)
-						                        {
-						                            $title = $title;
-						                        }  
-						                        $assigned_to = App\User::where('id','=',$ticket->assigned_to)->first();
-						                        if($assigned_to == null)
-						                        {
-						                            $assigned = "Unassigned";
-						                        }
-						                        else
-						                        {
-						                            $assigned = $assigned_to->first_name ." ". $assigned_to->last_name;
-						                        }
-						                        ?>
-						                        <td class="mailbox-name"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">{{$string}}   </a> ({!! $count!!}) <i class="fa fa-comment"></i>
-						                        @if($collab > 0)&nbsp;<i class="fa fa-users"></i>@endif 
-						                        @if($attach > 0)&nbsp;<i class="fa fa-paperclip"></i>@endif</td>
-						                        <td class="mailbox-Id"><a href="{!! route('ticket.thread',[$ticket->id]) !!}" title="{!! $title->title !!}">#{!! $ticket->ticket_number !!}</a></td>
-						                        <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $ticket->priority_id)->first();?>
-						                        <td class="mailbox-priority"><spam class="btn btn-{{$priority->priority_color}} btn-xs">{{$priority->priority}}</spam></td>
-						                        <?php $from = App\User::where('id','=',$ticket->user_id)->first();   ?> 
-						                <td class="mailbox-last-reply" style="color:{!! $rep !!}">{!! $username !!}</td>
-						                <td>{!! $assigned !!}</td>
-						                <td class="mailbox-last-activity">{!! UTC::usertimezone($title->updated_at) !!}</td>
-						                </tr>
-						                @endforeach
-						                </tbody>
-						            </table><!-- /.table -->
-						            
-						            <div class="pull-right">
-						                <?php echo $tickets->setPath(url('/ticket/open'))->render();?>&nbsp;
-						            </div>
-						        </div><!-- /.mail-box-messages -->
-						        {!! Form::close() !!}
-
-                  </div><!-- /.tab-pane -->
-                </div><!-- /.tab-content -->
-              </div><!-- nav-tabs-custom -->
-            </div><!-- /.col -->          
-          </div> <!-- /.row -->
-          </div>
-          </div>
-          <!-- END CUSTOM TABS -->
-
-{{-- MODAL POPUPS --}}
-    
-	<div class="modal fade" id="create_org">
-        <div class="modal-dialog" style="width:84%;height:70%;">
-            <div class="modal-content">
-                {!! Form::model($users->id, ['id'=>'form','method' => 'PATCH'] )!!}
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidd en="true">&times;</span></button>
-                    <h4 class="modal-title">{!! Lang::get('lang.create_organization') !!}</h4>
-                </div>
-                <div class="modal-body">
-						        <!-- failure message -->						        
-						        <div class="alert alert-danger alert-dismissable" id="alert-danger" style="display:none;"> 
-						            <i class="fa fa-ban"> </i> <b> Alert! <span id="get-danger"></span> </b>
-						            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-						        </div>						        
-                    <div class="row" id="hide">
-                        <div class="col-md-4">
-                            <div class="form-group">
-                                <label>{!! Lang::get('lang.name') !!}</label>
-                               	<input type="text" name="name" class="form-control">
-                                <spam id="error-name" style="display:none;position:fixed" class="call-out text-red">This is a required field</spam>
-                                <spam id="error-name1" style="display:none;position:fixed" class="call-out text-red">! Allready Taken</spam>
-                                <br/>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="form-group">
-                                <label>{!! Lang::get('lang.phone') !!}</label>
-                                <input type="number" name="phone" class="form-control">
-                                <br/>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="form-group">
-                                <label>{!! Lang::get('lang.website') !!}</label>
-                                <input type="url" name="website" placeholder="https://www.example.com" class="form-control">
-                                <spam id="error-website" style="display:none" class="help-block text-red">! Allready Taken</spam>
-                                <br/>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label>{!! Lang::get('lang.address') !!}</label>
-                                <textarea name="address" class="form-control"></textarea>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label>{!! Lang::get('lang.internal_notes') !!}</label>
-                              	<textarea name="internal" class="form-control"></textarea>
-                            </div>
-                        </div>
-                    </div>
-                    <div id="show2" style="display:none;">
-	                    <div class="row row-md-12">
-	                        <div class="col-xs-5">
-	                        </div>
-	                        <div class="col-xs-2">
-	                            <img src="{{asset("lb-faveo/media/images/gifloader.gif")}}">
-	                        </div>
-	                        <div class="col-xs-5">
-	                        </div>
-	                    </div>
-                	</div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis">{!! Lang::get('lang.close') !!}</button>
-                    <input type="submit" class="btn btn-primary pull-right" value="{!! Lang::get('lang.update') !!}">
-                </div>
-                {!! Form::close() !!}
-            </div><!-- /.modal-content -->
-        </div><!-- /.modal-dialog -->
-    </div><!-- /.modal -->
-
-
-<script type="text/javascript">
-
-
-    jQuery(document).ready(function($) {
-// create org
-        $('#form').on('submit', function() {
-            $.ajax({
-                type: "POST",
-                url: "../user-org/{{$users->id}}",
-                dataType: "html",
-                data: $(this).serialize(),
-                beforeSend: function() {
-                    $("#hide").hide();
-                    $("#show2").show();
-                },
-                success: function(response) {
-                    $("#show2").hide();
-                    $("#hide").show();
-                    
-                    if (response == 0) {
-                        message = "Organization added successfully."
-                        $("#dismis").trigger("click");
-                        $("#refresh-org").load("../user/{{ $users->id }}  #refresh-org");
-                        // $("#refresh2").load("../thread/{{$users->id}}   #refresh2");
-                        // $("#show").show();
-                        $("#alert-success").show();
-                        $('#get-success').html(message);
-                        setInterval(function(){$("#alert-success").hide(); },4000);   
-
-                    } else {
-                    	message = response;
-                        $("#alert-danger").show();
-                        $('#get-danger').html(message);
-                    }
-                }
-            })
-            return false;
-        });
-    });
-
-
-</script>
-
-<!-- Organisation Assign Modal -->
-    <div class="modal fade" id="assign">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                {!! Form::model($users->id, ['id'=>'org_assign','method' => 'PATCH'] )!!}
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" id="dismiss" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">{!! Lang::get('lang.assign') !!}</h4>
-                </div>
-                <div id="assign_alert" class="alert alert-success alert-dismissable" style="display:none;">
-                    <button id="assign_dismiss" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <h4><i class="icon fa fa-check"></i>Alert!</h4>
-                    <div id="message-success1"></div>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-                        <div class="col-md-4">
-                        </div>
-                        <div class="col-md-6" id="assign_loader" style="display:none;">
-                            <img src="{{asset("lb-faveo/media/images/gifloader.gif")}}"><br/><br/><br/>
-                        </div>
-                    </div>
-                    <div id="assign_body">
-                        <p>{!! Lang::get('lang.please_select_an_organization') !!}</p>
-                        <select id="org" class="form-control" name="org">
-<?php
-$orgs = App\Model\helpdesk\Agent_panel\Organization::all();
-?>
-                            <optgroup label="Select Organizations">
-                                @foreach($orgs as $org)
-                                    <option  value="{{$org->id}}">{!! $org->name !!}</option>
-                                @endforeach
-                            </optgroup>
-                        </select>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis4">{!! Lang::get('lang.close') !!}</button>
-                    <button type="submit" class="btn btn-success pull-right" id="submt2">{!! Lang::get('lang.assign') !!}</button>
-                </div>
-                {!! Form::close()!!}
-            </div><!-- /.modal-content -->
-        </div><!-- /.modal-dialog -->
-    </div><!-- /.modal -->
-
-
-<script type="text/javascript">
-// Assign a ticket
-    jQuery(document).ready(function($) {
-// create org
-        $('#org_assign').on('submit', function() {
-            $.ajax({
-                type: "POST",
-                url: "../user-org-assign/{{$users->id}}",
-                dataType: "html",
-                data: $(this).serialize(),
-                beforeSend: function() {
-                    $("#hide").hide();
-                    $("#show2").show();
-                },
-                success: function(response) {
-                    $("#show2").hide();
-                    $("#hide").show();
-                    
-                    if (response == 1) {
-                        message = "Organization added successfully."
-                        $("#dismiss").trigger("click");
-                        $("#refresh-org").load("../user/{{ $users->id }}  #refresh-org");
-                        // $("#refresh2").load("../thread/{{$users->id}}   #refresh2");
-                        // $("#show").show();
-                        $("#alert-success").show();
-                        $('#get-success').html(message);
-                        setInterval(function(){$("#alert-success").hide(); },4000);   
-                    }
-                }
-            })
-            return false;
-        });
-    });
-
-</script>
-
-
-
-<script type="text/javascript">
-
-    $(function () {
-        //Enable check and uncheck all functionality
-        $(".checkbox-toggle").click(function () {
-    	    var clicks = $(this).data('clicks');
-        	if (clicks) {
-            	//Uncheck all checkboxes
-	            $(".mailbox-messages input[type='checkbox']").iCheck("uncheck");
-	            $(".fa", this).removeClass("fa-check-square-o").addClass('fa-square-o');
-          	} else {
-	            //Check all checkboxes
-	            $(".mailbox-messages input[type='checkbox']").iCheck("check");
-	            $(".fa", this).removeClass("fa-square-o").addClass('fa-check-square-o');
-			}          
-          	$(this).data("clicks", !clicks);
-        });
-    });
-
-
-
-    $(function() {
-        // Enable check and uncheck all functionality
-        $(".checkbox-toggle").click(function() {
-            var clicks = $(this).data('clicks');
-            if (clicks) {
-                //Uncheck all checkboxes
-                $("input[type='checkbox']", ".mailbox-messages").iCheck("uncheck");
-            } else {
-                //Check all checkboxes
-                $("input[type='checkbox']", ".mailbox-messages").iCheck("check");
-            }
-            $(this).data("clicks", !clicks);
-        });
-    });
-
-
-    $(document).ready(function() { /// Wait till page is loaded
-        $('#click').click(function() {
-            $('#refresh').load('open #refresh');
-            $("#show").show();
-        });
-    });
-
-
-
-</script>
-<script>
-    $(function () {
-        $("textarea").wysihtml5();
-    });
-</script>
-@stop
-<!-- /content -->

resources/views/themes/default1/agent/kb/article/create.blade.php

@@ -88,11 +88,13 @@ class="active"
                         {!! Form::textarea('description',null,['class' => 'form-control','id'=>'editor','size' => '128x20','placeholder'=>Lang::get('lang.enter_the_description')]) !!}
                     </div>
                     <script>
-CKEDITOR.replace('editor', {
-    filebrowserImageBrowseUrl: '../laravel-filemanager?type=Images',
-    filebrowserImageUploadUrl: '../laravel-filemanager/upload?type=Images&_token={{csrf_token()}}',
-});
-                    </script>
+  CKEDITOR.replace( 'editor', {
+    filebrowserImageBrowseUrl: '{{url("laravel-filemanager?type=Images")}}',
+    filebrowserImageUploadUrl: '{{url("laravel-filemanager/upload?type=Images")}}',
+    filebrowserBrowseUrl: '{{url("laravel-filemanager?type=Files")}}',
+    filebrowserUploadUrl: '{{url("laravel-filemanager/upload?type=Files")}}'
+  });
+</script>
                 </div>
             </div>
         </div>
@@ -231,4 +233,19 @@ CKEDITOR.replace('editor', {
                     </li>
                     </ul>
                 </div>
+                
+<script>
+    $(function() {
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
+</script>
+
+
                 @stop

resources/views/themes/default1/agent/kb/article/edit.blade.php

@@ -85,9 +85,12 @@ class="active"
                     {!! Form::textarea('description',$article->description,['class' => 'form-control','id'=>'editor','size' => '128x20','placeholder'=>Lang::get('lang.enter_the_description')]) !!}
                 </div>
                 <script>
+                    CKEDITOR.config.allowedContent = true;
 CKEDITOR.replace('editor', {
-    filebrowserImageBrowseUrl: '../../laravel-filemanager?type=Images',
-    filebrowserImageUploadUrl: '../../laravel-filemanager/upload?type=Images&_token={{csrf_token()}}',
+    filebrowserImageBrowseUrl: '{{url("laravel-filemanager?type=Images")}}',
+    filebrowserImageUploadUrl: '{{url("laravel-filemanager/upload?type=Images")}}',
+    filebrowserBrowseUrl: '{{url("laravel-filemanager?type=Files")}}',
+    filebrowserUploadUrl: '{{url("laravel-filemanager/upload?type=Files")}}'
 });
                 </script>
             </div>
@@ -167,7 +170,17 @@ CKEDITOR.replace('editor', {
                     </div>
                     {!! Form::close() !!}
                     <div class="box-footer" style="background-color:#f5f5f5;">
-                        {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!}
+                        <div class="row">
+                            <div class="col-md-4">
+                                {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!}
+                            </div>
+                            <div class="col-md-4">
+                                <a href="#" data-toggle="modal" data-target="#deletearticle{{$article->id}}"  class="btn btn-danger pull-right">{{Lang::get('lang.delete')}}</a>
+                            </div>
+                            <div class="col-md-4">
+                                <a href="{{url('show/'.$article->slug)}}" target="_blank" class="btn btn-primary">{{Lang::get('lang.show')}}</a>
+                            </div>
+                        </div>
                     </div>
                     </li>
                     <li>
@@ -224,5 +237,38 @@ CKEDITOR.replace('editor', {
                         </div>
                     </li>
                     </ul>
+    
+<script>
+    $(function() {
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
+</script>
+
                     @stop
-                    <!-- /content -->
+                    <!-- /content -->
+                    
+                    
+                    <div class="modal fade" id="deletearticle{{$article->id}}">
+        			<div class="modal-dialog">
+            			<div class="modal-content">
+                			<div class="modal-header">
+                    			<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    			<h4 class="modal-title">Are You Sure ?</h4>
+                			</div>
+                			<div class="modal-body">
+                				{{$article->name}}
+                			</div>
+                			<div class="modal-footer">
+                    			<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
+                    			<a href='{{url("article/delete/$article->slug")}}'><button class="btn btn-danger">delete</button></a>
+                			</div>
+            			</div><!-- /.modal-content -->
+        			</div><!-- /.modal-dialog -->
+    			</div>

resources/views/themes/default1/agent/kb/article/index.blade.php

@@ -39,8 +39,9 @@ class="active"
         @endif
         {!! Datatable::table()
         ->addColumn(Lang::get('lang.name'),
-        Lang::get('lang.create'),
+        Lang::get('lang.publish_time'),
         Lang::get('lang.action'))       // these are the column headings to be shown
+        ->setOrder(array(1=>'desc')) 
         ->setUrl(route('api.article'))   // this is the route where data will be retrieved
         ->render() !!}
     </div>

resources/views/themes/default1/agent/kb/category/create.blade.php

@@ -65,19 +65,20 @@ class="active"
                 {!! Form::label('name',Lang::get('lang.name')) !!}<span class="text-red"> *</span>
                 {!! Form::text('name',null,['class' => 'form-control']) !!}
             </div>
-            <div class="col-xs-3 form-group {{ $errors->has('slug') ? 'has-error' : '' }}">
-                {!! Form::label('slug',Lang::get('lang.slug')) !!}<span class="text-red"> *</span>
-                {!! Form::text('slug',null,['class' => 'form-control']) !!}
-            </div>
             <div class="col-xs-3 form-group {{ $errors->has('parent') ? 'has-error' : '' }}">
                 {!! Form::label('parent',Lang::get('lang.parent')) !!}
-                {!!Form::select('parent',[''=>'Select a Group','Categorys'=>$category->lists('name','name')->toArray()],null,['class' => 'form-control select']) !!}
+                {!!Form::select('parent',[''=>'Select a Category','Categories'=>$category],null,['class' => 'form-control select']) !!}
             </div>
             <div class="col-xs-3 form-group {{ $errors->has('status') ? 'has-error' : '' }}">
                 {!! Form::label('status',Lang::get('lang.status')) !!}
-                <br/>
-                {!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}
-                {!! Form::radio('status','0',null) !!} {{Lang::get('lang.inactive')}}
+                <div class="row">
+                    <div class="col-md-4">
+                        {!! Form::radio('status','1',true) !!} {{ Lang::get('lang.active')}}
+                    </div>
+                    <div class="col-md-6">
+                        {!! Form::radio('status','0',null) !!} {{ Lang::get('lang.inactive')}}
+                    </div>
+                </div>
             </div>
             <div class="col-md-12 form-group {{ $errors->has('description') ? 'has-error' : '' }}">
                 {!! Form::label('description',Lang::get('lang.description')) !!}<span class="text-red"> *</span>
@@ -94,4 +95,18 @@ class="active"
         $("textarea").wysihtml5();
     });
 </script>
+
+<script>
+    $(function() {
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
+</script>
+
 @stop

resources/views/themes/default1/agent/kb/category/edit.blade.php

@@ -63,24 +63,19 @@ active
 
                 {!! Form::text('name',null,['class' => 'form-control']) !!}
             </div>
-            <div class="col-xs-3 form-group {{ $errors->has('slug') ? 'has-error' : '' }}">
-                {!! Form::label('slug',Lang::get('lang.slug')) !!}<span class="text-red"> *</span>
-
-                {!! Form::text('slug',null,['class' => 'form-control']) !!}
-            </div>
             <div class="col-xs-3 form-group {{ $errors->has('parent') ? 'has-error' : '' }}">
                 {!! Form::label('parent',Lang::get('lang.parent')) !!}
 
-                {!!Form::select('parent',[''=>'Select a Group','Categorys'=>$category->lists('name','name')->toArray()],null,['class' => 'form-control select']) !!}
+                {!!Form::select('parent',[''=>'Select a Group','Categorys'=>$categories],null,['class' => 'form-control select']) !!}
             </div>
             <div class="col-xs-3 form-group {{ $errors->has('status') ? 'has-error' : '' }}">
                 {!! Form::label('status',Lang::get('lang.status')) !!}
 
                 <div class="row">
-                    <div class="col-xs-3">
+                    <div class="col-xs-4">
                         {!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}
                     </div>
-                    <div class="col-xs-3">
+                    <div class="col-xs-6">
                         {!! Form::radio('status','0',null) !!} {{Lang::get('lang.inactive')}}
                     </div>
                 </div>
@@ -101,4 +96,18 @@ active
         $("textarea").wysihtml5();
     });
 </script>
+
+<script>
+    $(function() {
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
+</script>
+
 @stop

resources/views/themes/default1/agent/kb/pages/create.blade.php

@@ -54,11 +54,7 @@ class="active"
 
                             {!! Form::text('name',null,['class' => 'form-control']) !!}
                         </div>
-                        <div class="col-md-6 form-group {{ $errors->has('slug') ? 'has-error' : '' }}">
-                            {!! Form::label('slug',Lang::get('lang.slug')) !!}<span class="text-red"> *</span>
-
-                            {!! Form::text('slug',null,['class' => 'form-control']) !!}
-                        </div>
+                        
                     </div>
                     <div class="form-group {{ $errors->has('description') ? 'has-error' : '' }}">
                         {!! Form::label('description',Lang::get('lang.description')) !!}
@@ -117,4 +113,17 @@ class="active"
         $("textarea").wysihtml5();
     });
 </script>
+
+<script>
+    $(function() {
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    });        
+</script>
 @stop

resources/views/themes/default1/agent/kb/pages/edit.blade.php

@@ -52,11 +52,7 @@ class="active"
 
                             {!! Form::text('name',null,['class' => 'form-control']) !!}
                         </div>
-                        <div class="col-md-6 form-group {{ $errors->has('slug') ? 'has-error' : '' }}">
-                            {!! Form::label('slug',Lang::get('lang.slug')) !!}<span class="text-red"> *</span>
-
-                            {!! Form::text('slug',null,['class' => 'form-control']) !!}
-                        </div>
+                        
                     </div>
                     <div class="form-group {{ $errors->has('description') ? 'has-error' : '' }}">
                         {!! Form::label('description',Lang::get('lang.description')) !!}
@@ -114,5 +110,16 @@ class="active"
     $(function() {
         $("textarea").wysihtml5();
     });
+    
+    $(function() {
+        
+        $('input[type="checkbox"]').iCheck({
+            checkboxClass: 'icheckbox_flat-blue'
+        });
+        $('input[type="radio"]').iCheck({
+            radioClass: 'iradio_flat-blue'
+        });
+    
+    }); 
 </script>
 @stop

resources/views/themes/default1/agent/layout/agent.blade.php

@@ -6,53 +6,59 @@
         <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
         <meta name="_token" content="{!! csrf_token() !!}"/>
         <!-- faveo favicon -->
-        <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
+        <link href="{{asset("lb-faveo/media/images/favicon.ico")}}" rel="shortcut icon">
         <!-- Bootstrap 3.3.2 -->
         <link href="{{asset("lb-faveo/css/bootstrap.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- Font Awesome Icons -->
         <link href="{{asset("lb-faveo/css/font-awesome.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- Ionicons -->
-        <link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet">
+        <link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet"  type="text/css" />
         <!-- Theme style -->
         <link href="{{asset("lb-faveo/css/AdminLTE.css")}}" rel="stylesheet" type="text/css" />
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-             folder instead of downloading all of them to reduce the load. -->
+        <!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
         <link href="{{asset("lb-faveo/css/skins/_all-skins.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- iCheck -->
         <link href="{{asset("lb-faveo/plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/tabby.css")}}" type="text/css">
-        <link href="{{asset("lb-faveo/css/jquerysctipttop.css")}}" rel="stylesheet" type="text/css">
+        <link href="{{asset("lb-faveo/css/tabby.css")}}" rel="stylesheet" type="text/css"/>
+        
+        <link href="{{asset("lb-faveo/css/jquerysctipttop.css")}}" rel="stylesheet" type="text/css"/>
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/editor.css")}}" type="text/css">
-        <link href="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" rel="stylesheet" type="text/css" />
-        <link type="text/css" href="{{asset("lb-faveo/css/jquery.ui.css")}}" rel="stylesheet">
-        <link type="text/css" href="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.css")}}" rel="stylesheet">
-        <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />        
-        <link rel="stylesheet" type="text/css" href="{{asset("lb-faveo/css/faveo-css.css")}}">
-        <link rel="stylesheet" type="text/css" href="{{asset("lb-faveo/css/notification-style.css")}}">
+        <link href="{{asset("lb-faveo/css/editor.css")}}" rel="stylesheet" type="text/css"/>
 
+        <link href="{{asset("lb-faveo/css/jquery.ui.css")}}" rel="stylesheet" rel="stylesheet"/>
+        
+        <link href="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.css")}}" rel="stylesheet"  type="text/css"/>
+        
+        <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css"/>
+
+        <link href="{{asset("lb-faveo/css/faveo-css.css")}}" rel="stylesheet" type="text/css" />
+        
+        <link href="{{asset("lb-faveo/css/notification-style.css")}}" rel="stylesheet" type="text/css" >
+        
         <link href="{{asset("lb-faveo/css/jquery.rating.css")}}" rel="stylesheet" type="text/css" />
-
         <!-- Select2 -->
-        <link rel="stylesheet" href="{{asset("lb-faveo/plugins/select2/select2.min.css")}}">
+        <link href="{{asset("lb-faveo/plugins/select2/select2.min.css")}}" rel="stylesheet" type="text/css" />
+        <!-- autocomplete -->
+        <link href="{{asset("lb-faveo/css/autocomplete.css")}}" rel="stylesheet" type="text/css" />
         <!--[if lt IE 9]>
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
             <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
         <![endif]-->
         <script src="{{asset("lb-faveo/js/jquery-2.1.4.js")}}" type="text/javascript"></script>
+        
         <script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
 
         @yield('HeadInclude')
     </head>
-    <body class="skin-yellow skin-green fixed">
+    <body class="skin-blue fixed">
         <div class="wrapper">
             <header class="main-header">
                 <a href="http://www.faveohelpdesk.com" class="logo"><img src="{{ asset('lb-faveo/media/images/logo.png')}}" width="100px;"></a>
                 <?php
                 $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first();
                 if ($company != null) {
-                    
+
                 }
                 $replacetop = 0;
                 $replacetop = \Event::fire('service.desk.agent.topbar.replace', array());
@@ -73,7 +79,7 @@
                 ?>
 
                 <!-- Header Navbar: style can be found in header.less -->
-                <nav class="navbar navbar-static-top" role="navigation">
+                <nav class="navbar navbar-static-top">
                     <!-- Sidebar toggle button-->
                     <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
                         <span class="sr-only">Toggle navigation</span>
@@ -82,24 +88,24 @@
                         <span class="icon-bar"></span>
                     </a>
                     <?php $notifications = App\Http\Controllers\Common\NotificationController::getNotifications();
+
                     ?>
                     <div class="collapse navbar-collapse" id="navbar-collapse">
+                        @if($replacetop==0)
                         <ul class="tabs tabs-horizontal nav navbar-nav navbar-left">
-                            @if($replacetop==0)
-                            <li @yield('Dashboard')><a data-target="#tabA" href="#">{!! Lang::get('lang.dashboard') !!}</a></li>
+                            <li @yield('Dashboard')><a data-target="#tabA" href="{{URL::route('dashboard')}}" onclick="clickDashboard();">{!! Lang::get('lang.dashboard') !!}</a></li>
                             <li @yield('Users')><a data-target="#tabB" href="#">{!! Lang::get('lang.users') !!}</a></li>
                             <li @yield('Tickets')><a data-target="#tabC" href="#">{!! Lang::get('lang.tickets') !!}</a></li>
                             <li @yield('Tools')><a data-target="#tabD" href="#">{!! Lang::get('lang.tools') !!}</a></li>
-                            @else 
+                        </ul>
+                        @else
                             <?php \Event::fire('service.desk.agent.topbar', array()); ?>
                             @endif
-                        </ul>
-
                         <?php $noti = \App\Model\helpdesk\Notification\UserNotification::where('user_id', '=', Auth::user()->id)->where('is_read', '0')->get(); ?>
-
                         <ul class="nav navbar-nav navbar-right">
                             @if(Auth::user()->role == 'admin')
                             <li><a href="{{url('admin')}}">{!! Lang::get('lang.admin_panel') !!}</a></li>
+                            @include('themes.default1.update.notification')
                             @endif
                             <!-- User Account: style can be found in dropdown.less -->
                             <li class="dropdown notifications-menu" id="myDropdown">
@@ -154,7 +160,6 @@
                                         @endif
                                         @endif
                                         @endforeach
-
                                     </ul>
                             </li>
                             <li class="footer no-border"><div class="col-md-5"></div><div class="col-md-2">
@@ -162,7 +167,6 @@
                                 </div><div class="col-md-5"></div></li>
                             <li class="footer"><a href="{{ url('notifications-list')}}">View all</a>
                             </li>
-
                         </ul>
                         </li>
                         <!-- User Account: style can be found in dropdown.less -->
@@ -171,12 +175,12 @@
                                 @if(Auth::user())
                                 <img src="{{Auth::user()->profile_pic}}"class="user-image" alt="User Image"/>
                                 <span class="hidden-xs">{{Auth::user()->first_name." ".Auth::user()->last_name}}</span>
-                                @endif          
+                                @endif
                             </a>
                             <ul class="dropdown-menu">
                                 <!-- User image -->
-                                <li class="user-header"  style="background-color:#343F44;">     
-                                    <img src="{{Auth::user()->profile_pic}}" class="img-circle" alt="User Image" />                                        
+                                <li class="user-header"  style="background-color:#343F44;">
+                                    <img src="{{Auth::user()->profile_pic}}" class="img-circle" alt="User Image" />
                                     <p>
                                         {{Auth::user()->first_name." ".Auth::user()->last_name}} - {{Auth::user()->role}}
                                         <small></small>
@@ -239,7 +243,6 @@
                     <!-- /.search form -->
                     <!-- sidebar menu: : style can be found in sidebar.less -->
                     <ul id="side-bar" class="sidebar-menu">
-
                         @if($replaceside==0)
                         @yield('sidebar')
                         <li class="header">{!! Lang::get('lang.Tickets') !!}</li>
@@ -255,7 +258,7 @@
                             $myticket = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', Auth::user()->id)->where('status', '1')->get();
                             $unassigned = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('status', '=', '1')->where('dept_id', '=', Auth::user()->primary_dpt)->get();
                             $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '1')->where('dept_id', '=', Auth::user()->primary_dpt)->get();
-                            $deleted = App\Model\helpdesk\Ticket\Tickets::where('status', '5')->where('dept_id', '=', Auth::user())->get();
+                            $deleted = App\Model\helpdesk\Ticket\Tickets::where('status', '5')->where('dept_id', '=', Auth::user()->primary_dpt)->get();
                         }
                         if (Auth::user()->role == 'agent') {
                             $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first();
@@ -324,13 +327,7 @@
                             $underprocess = count($underprocess);
                             $closed = App\Model\helpdesk\Ticket\Tickets::where('status', '=', '2')->where('dept_id', '=', $dept->id)->get();
                             $closed = count($closed);
-                            // $underprocess = 0;
-                            // foreach ($inbox as $ticket4) {
-                            //  if ($ticket4->assigned_to == null) {
-                            //  } else {
-                            //      $underprocess++;
-                            //  }
-                            // }
+
                             if (Auth::user()->role == 'admin') {
                                 ?>
                                 <li class="treeview">
@@ -339,7 +336,7 @@
                                     </a>
                                     <ul class="treeview-menu">
                                         <li><a href="{!! url::route('dept.open.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.open') !!}<small class="label pull-right bg-green">{!! $open !!}</small></a></li>
-                                        <li><a href="{!! url::route('dept.inprogress.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.inprogress') !!}<small class="label pull-right bg-green">{!! $underprocess !!}</small></a></li>
+                                        <li><a href="{!! url::route('dept.inprogress.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.assigned') !!}<small class="label pull-right bg-green">{!! $underprocess !!}</small></a></li>
                                         <li><a href="{!! url::route('dept.closed.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.closed') !!}<small class="label pull-right bg-green">{!! $closed !!}</small></a></li>
                                     </ul>
                                 </li>
@@ -350,7 +347,7 @@
                                     </a>
                                     <ul class="treeview-menu">
                                         <li><a href="{!! url::route('dept.open.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.open') !!}<small class="label pull-right bg-green">{!! $open !!}</small></a></li>
-                                        <li><a href="{!! url::route('dept.inprogress.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.inprogress') !!}<small class="label pull-right bg-green">{!! $underprocess !!}</small></a></li>
+                                        <li><a href="{!! url::route('dept.inprogress.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.assigned') !!}<small class="label pull-right bg-green">{!! $underprocess !!}</small></a></li>
                                         <li><a href="{!! url::route('dept.closed.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.closed') !!}<small class="label pull-right bg-green">{!! $closed !!}</small></a></li>
                                     </ul>
                                 </li>
@@ -367,7 +364,7 @@
             <?php
             $agent_group = Auth::user()->assign_group;
             $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where('group_status', '=', '1')->first();
-// dd($group); 
+// dd($group);
             ?>
             <!-- Right side column. Contains the navbar and content of the page -->
             <div class="content-wrapper">
@@ -378,8 +375,6 @@
                             @if($replacetop==0)
                             <div class="tabs-pane @yield('dashboard-bar')"  id="tabA">
                                 <ul class="nav navbar-nav">
-                                    <li id="bar" @yield('dashboard') ><a href="{{url('dashboard')}}">{!! Lang::get('lang.dashboard') !!}</a></li>
-                                    <li id="bar" @yield('profile') ><a href="{{url('profile')}}">{!! Lang::get('lang.profile') !!}</a></li>
                                 </ul>
                             </div>
                             <div class="tabs-pane @yield('user-bar')" id="tabB">
@@ -405,7 +400,9 @@
                             <div class="tabs-pane @yield('tools-bar')" id="tabD">
                                 <ul class="nav navbar-nav">
                                     <li id="bar" @yield('tools')><a href="{{ url('/canned/list')}}" >{!! Lang::get('lang.canned_response') !!}</a></li>
+                                    @if(Auth::user()->role == 'admin')
                                     <li id="bar" @yield('kb')><a href="{{ url('/comment')}}" >{!! Lang::get('lang.knowledge_base') !!}</a></li>
+                                    @endif
                                 </ul>
                             </div>
                             @endif
@@ -435,47 +432,38 @@
                 <strong>{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}" target="_blank">{!! $company->company_name !!}</a>.</strong> {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/" target="_blank">Faveo</a>
             </footer>
         </div><!-- ./wrapper -->
-        {{-- // <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> --}}
 
-        <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}"></script>
+    <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}" type="text/javascript"></script>
+    
+    <script src="{{asset("lb-faveo/js/bootstrap-datetimepicker4.7.14.min.js")}}" type="text/javascript"></script>
+    <!-- Bootstrap 3.3.2 JS -->
+    <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
+    <!-- Slimscroll -->
+    <script src="{{asset("lb-faveo/plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
+    <!-- FastClick -->
+    <script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}"  type="text/javascript"></script>
+    <!-- AdminLTE App -->
+    <script src="{{asset("lb-faveo/js/app.min.js")}}" type="text/javascript"></script>
 
-        {{-- // <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.7.14/js/bootstrap-datetimepicker.min.js"></script> --}}
-
-        <script src="{{asset("lb-faveo/js/bootstrap-datetimepicker4.7.14.min.js")}}" type="text/javascript"></script>
-        <!-- Bootstrap 3.3.2 JS -->
-        <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
-        <!-- Slimscroll -->
-        <script src="{{asset("lb-faveo/plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
-        <!-- FastClick -->
-        <script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}"></script>
-        <!-- AdminLTE App -->
-        <script src="{{asset("lb-faveo/js/app.min.js")}}" type="text/javascript"></script>
-        <!-- AdminLTE for demo purposes -->
-        {{-- // <script src="{{asset("dist/js/demo.js")}}" type="text/javascript"></script> --}}
     <!-- iCheck -->
     <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
-    {{-- maskinput --}}
-    {{-- // <script src="js/jquery.maskedinput.min.js" type="text/javascript"></script> --}}
-    {{-- jquery ui --}}
+    <!-- jquery ui -->
     <script src="{{asset("lb-faveo/js/jquery.ui.js")}}" type="text/javascript"></script>
+    
     <script src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}" type="text/javascript"></script>
+    
     <script src="{{asset("lb-faveo/plugins/datatables/jquery.dataTables.js")}}" type="text/javascript"></script>
     <!-- Page Script -->
+    <script src="{{asset("lb-faveo/js/jquery.dataTables1.10.10.min.js")}}" type="text/javascript" ></script>
 
-    {{-- // <script type="text/javascript" src="https://cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js"></script> --}}
-    <script type="text/javascript" src="{{asset("lb-faveo/js/jquery.dataTables1.10.10.min.js")}}"></script>
+    <script type="text/javascript" src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}"  type="text/javascript"></script>
 
-    <script type="text/javascript" src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}"></script>
     <script src="{{asset("lb-faveo/js/jquery.rating.pack.js")}}" type="text/javascript"></script>
 
-    <script src="{{asset("lb-faveo/plugins/select2/select2.full.min.js")}}" ></script>
-    <script src="{{asset("lb-faveo/plugins/moment/moment.js")}}" ></script>
-    <script>
-                function myFunction() {
+    <script src="{{asset("lb-faveo/plugins/select2/select2.full.min.js")}}" type="text/javascript"></script>
+
+    <script src="{{asset("lb-faveo/plugins/moment/moment.js")}}" type="text/javascript"></script>
 
-                document.getElementById("count").innerHTML = "0";
-                }
-    </script>
     <script>
         $(document).ready(function () {
 
@@ -490,7 +478,7 @@
                         cache: false,
                         success: function (html)
                         {
-//$(".city").html(html);
+
                         }
                 });
         });
@@ -521,12 +509,6 @@
         });</script>
     <script>
                 $(function() {
-                // Enable iCheck plugin for checkboxes
-                // iCheck for checkbox and radio inputs
-                // $('input[type="checkbox"]').iCheck({
-                // checkboxClass: 'icheckbox_flat-blue',
-                // radioClass: 'iradio_flat-blue'
-                // });
                 // Enable check and uncheck all functionality
                 $(".checkbox-toggle").click(function() {
                 var clicks = $(this).data('clicks');
@@ -556,31 +538,25 @@
                         $this.toggleClass("fa-star-o");
                 }
                 });
-                });</script>
-    <script type="text/javascript">
-                //     $(document).ready(function() {
-                //         $("#content").Editor();
-                //     });
-                // </script>
-   <!-- // <script src="../plugins/jQuery/jQuery-2.1.3.min.js"></script> -->
-    <script src="{{asset("lb-faveo/js/tabby.js")}}"></script>
-     <!-- // <script src="{{asset("dist/js/editor.js")}}"></script> -->
-    <!-- CK Editor -->
-    <!-- // <script src="{{asset("//cdn.ckeditor.com/4.4.3/standard/ckeditor.js")}}"></script> -->
-    {{-- // <script src="{{asset("lb-faveo/downloads/CKEditor.js")}}"></script> --}}
-<script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
-<script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
-<script>
-            // $(function () {
-            // //Add text editor
-            // $("textarea").wysihtml5();
-            // });
+                });
 </script>
+
+<script src="{{asset("lb-faveo/js/tabby.js")}}" type="text/javascript"></script>
+
+<script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" type="text/javascript"></script>
+
+<script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
+
 <script type="text/javascript">
             $.ajaxSetup({
             headers: { 'X-CSRF-Token' : $('meta[name=_token]').attr('content') }
             });
 </script>
+<script type="text/javascript">
+    function clickDashboard() {
+        window.location = "{{URL::route('dashboard')}}";
+    }
+</script>
 @yield('FooterInclude')
 </body>
 </html>

resources/views/themes/default1/agent/layout/agent2.blade.php

@@ -1,498 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
- <meta charset="UTF-8" ng-app="myApp">
-        <title>Faveo | HELP DESK</title>
-        <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-        <meta name="_token" content="{!! csrf_token() !!}"/>
-        <!-- faveo favicon -->
-        <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
-        <!-- Bootstrap 3.3.2 -->
-        <link href="{{asset("lb-faveo/css/bootstrap.min.css")}}" rel="stylesheet" type="text/css" />
-        <!-- Font Awesome Icons -->
-        <link href="{{asset("lb-faveo/css/font-awesome.min.css")}}" rel="stylesheet" type="text/css" />
-        <!-- Ionicons -->
-        <link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet">
-        <!-- Theme style -->
-        <link href="{{asset("lb-faveo/css/AdminLTE.css")}}" rel="stylesheet" type="text/css" />
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-             folder instead of downloading all of them to reduce the load. -->
-        <link href="{{asset("lb-faveo/css/skins/_all-skins.min.css")}}" rel="stylesheet" type="text/css" />
-        <!-- iCheck -->
-        <link href="{{asset("lb-faveo/plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/tabby.css")}}" type="text/css">
-        <link href="{{asset("lb-faveo/css/jquerysctipttop.css")}}" rel="stylesheet" type="text/css">
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/editor.css")}}" type="text/css">
-        <link href="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" rel="stylesheet" type="text/css" />
-        <link type="text/css" href="{{asset("lb-faveo/css/jquery.ui.css")}}" rel="stylesheet">
-        <link type="text/css" href="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.css")}}" rel="stylesheet">
-        <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />        
-        <link rel="stylesheet" type="text/css" href="{{asset("lb-faveo/css/faveo-css.css")}}">
-        <link rel="stylesheet" type="text/css" href="{{asset("lb-faveo/css/notification-style.css")}}">
-
-        <link href="{{asset("lb-faveo/css/jquery.rating.css")}}" rel="stylesheet" type="text/css" />
-
-        <!-- Select2 -->
-        <link rel="stylesheet" href="{{asset("lb-faveo/plugins/select2/select2.min.css")}}">
-        <!--[if lt IE 9]>
-            <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-            <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-        <![endif]-->
-        <script src="{{asset("lb-faveo/js/jquery-2.1.4.js")}}" type="text/javascript"></script>
-        <script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
-
-        @yield('HeadInclude')
-    </head>
-    <body class="skin-yellow skin-green fixed">
-        <div class="wrapper">
-            <header class="main-header">
-                <a href="http://www.faveohelpdesk.com" class="logo"><img src="{{ asset('lb-faveo/media/images/logo.png') }}" width="100px;"></a>
-<?php
-$company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first();
-if ($company != null) {
-}
-?>
-                <!-- Header Navbar: style can be found in header.less -->
-                <nav class="navbar navbar-static-top" role="navigation">
-                    <!-- Sidebar toggle button-->
-                    <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
-                        <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </a>
-                    <?php $notifications = App\Http\Controllers\Common\NotificationController::getNotifications();
-                    ?>
-                    <div class="collapse navbar-collapse" id="navbar-collapse">
-                        <ul class="tabs tabs-horizontal nav navbar-nav navbar-left">
-                            <li @yield('Dashboard')><a data-target="#tabA" href="#">{!! Lang::get('lang.dashboard') !!}</a></li>
-                            <li @yield('Users')><a data-target="#tabB" href="#">{!! Lang::get('lang.users') !!}</a></li>
-                            <li @yield('Tickets')><a data-target="#tabC" href="#">{!! Lang::get('lang.tickets') !!}</a></li>
-                            <li @yield('Tools')><a data-target="#tabD" href="#">{!! Lang::get('lang.tools') !!}</a></li>
-                        </ul>
-                        <ul class="nav navbar-nav navbar-right">
-                            @if(Auth::user()->role == 'admin')
-                                <li><a href="{{url('admin')}}">{!! Lang::get('lang.admin_panel') !!}</a></li>
-                            @endif
-                            <!-- User Account: style can be found in dropdown.less -->
-                            <li class="dropdown notifications-menu">
-                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="myFunction()">
-                                    <i class="fa fa-bell-o"></i>
-                                    <span class="label label-warning" id="count">{!! count($notifications) !!}</span>
-                                </a>
-                                <ul class="dropdown-menu">
-                                    <li class="header">You have {!! count($notifications) !!} notifications</li>
-                                    <li>
-
-                                        <ul class="menu">
-                                            @foreach($notifications as $notification)
-                                            @if($notification->type == 'registration')
-                                            <li>
-                                                <a href="{!! route('user.show', $notification->model_id) !!}" id="{{$notification->notification_id}}" class='noti_User'>
-                                                    <i class="{!! $notification->icon_class !!}"></i> {!! $notification->message !!}
-                                                </a>
-                                            </li>
-                                            @else
-                                            <li>
-                                                <a href="{!! route('ticket.thread', $notification->model_id) !!}" id='{{ $notification->notification_id}}' class='noti_User'>
-                                                    <i class="{!! $notification->icon_class !!}"></i> {!! $notification->message !!}
-                                                </a>
-                                            </li>
-                                            @endif
-                                            @endforeach
-
-                                        </ul>
-                                    </li>
-                                    <li class="footer"><a href="{{ url('notifications-list')}}">View all</a>
-                                    </li>
-
-                                </ul>
-                            </li>
-                            <!-- User Account: style can be found in dropdown.less -->
-                            <li class="dropdown user user-menu">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                @if(Auth::user())
-                                    
-                                        <img src="{{Auth::user()->profile_pic}}"class="user-image" alt="User Image"/>
-                                    
-                                    <span class="hidden-xs">{{Auth::user()->first_name." ".Auth::user()->last_name}}</span>
-                                @endif          
-                                </a>
-                                <ul class="dropdown-menu">
-                                    <!-- User image -->
-                                    <li class="user-header"  style="background-color:#343F44;">
-                                        
-                                        <img src="{{Auth::user()->profile_pic}}" class="img-circle" alt="User Image" />
-                                        
-                                        <p>
-                                            {{Auth::user()->first_name." ".Auth::user()->last_name}} - {{Auth::user()->role}}
-                                            <small></small>
-                                        </p>
-                                    </li>
-                                    <!-- Menu Footer-->
-                                    <li class="user-footer" style="background-color:#1a2226;">
-                                        <div class="pull-left">
-                                            <a href="{{URL::route('profile')}}" class="btn btn-info btn-sm"><b>{!! Lang::get('lang.profile') !!}</b></a>
-                                        </div>
-                                        <div class="pull-right">
-                                            <a href="{{url('auth/logout')}}" class="btn btn-danger btn-sm"><b>{!! Lang::get('lang.sign_out') !!}</b></a>
-                                        </div>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </div>
-
-                            </nav>
-                            </header>
-                            <!-- Left side column. contains the logo and sidebar -->
-                            <aside class="main-sidebar">
-                                <!-- sidebar: style can be found in sidebar.less -->
-                                <section class="sidebar">
-                                    <div class="user-panel">
-                                    @if (trim($__env->yieldContent('profileimg')))
-                                        <h1>@yield('profileimg')</h1>
-                                    @else
-                                    <div class = "row">
-                                        <div class="col-xs-3"></div>
-                                        <div class="col-xs-2" style="width:50%;">
-                                        <a href="{!! url('profile') !!}">
-                                        
-                                                <img src="{{Auth::user()->profile_pic}}" class="img-circle" alt="User Image" />
-                                        
-                                        </a>
-                                        </div>
-                                    </div>
-                                    @endif
-                                        <div class="info" style="text-align:center;">
-                                            @if(Auth::user())
-                                            <p>{{Auth::user()->first_name." ".Auth::user()->last_name}}</p>
-                                            @endif
-                                            @if(Auth::user() && Auth::user()->active==1)
-                                            <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
-                                            @else
-                                            <a href="#"><i class="fa fa-circle"></i> Offline</a>
-                                            @endif
-                                        </div>
-                                    </div>
-                                    <!-- search form -->
-                                    {{-- <form action="#" method="get" class="sidebar-form"> --}}
-                                        {{-- <div class="input-group"> --}}
-                                            {{-- <input type="text" name="q" class="form-control" placeholder="Search..."/> --}}
-                                            {{-- <span class="input-group-btn"> --}}
-                                                {{-- <button type='submit' name='seach' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button> --}}
-                                            {{-- </span> --}}
-                                        {{-- </div> --}}
-                                    {{-- </form> --}}
-                                    <!-- /.search form -->
-                                    <!-- sidebar menu: : style can be found in sidebar.less -->
-                                    <ul id="side-bar" class="sidebar-menu">
-                                        @yield('sidebar')
-                                        <li class="header">{!! Lang::get('lang.Tickets') !!}</li>
-<?php
-if(Auth::user()->role == 'admin') {
-//$inbox = App\Model\helpdesk\Ticket\Tickets::all();
-$myticket = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', Auth::user()->id)->where('status','1')->get();
-$unassigned = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=',null)->where('status', '=', '1')->get();
-$tickets = App\Model\helpdesk\Ticket\Tickets::where('status','1')->get();
-$deleted = App\Model\helpdesk\Ticket\Tickets::where('status', '5')->get();
-} elseif(Auth::user()->role == 'agent') {
-//$inbox = App\Model\helpdesk\Ticket\Tickets::where('dept_id','',Auth::user()->primary_dpt)->get();
-$myticket = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', Auth::user()->id)->where('status','1')->get();
-$unassigned = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=',null)->where('status', '=', '1')->where('dept_id','=',Auth::user()->primary_dpt)->get();
-$tickets = App\Model\helpdesk\Ticket\Tickets::where('status','1')->where('dept_id','=',Auth::user()->primary_dpt)->get();
-$deleted = App\Model\helpdesk\Ticket\Tickets::where('status', '5')->where('dept_id','=',Auth::user())->get();
-}
-if (Auth::user()->role == 'agent') {
-            $dept = App\Model\helpdesk\Agent\Department::where('id', '=', Auth::user()->primary_dpt)->first();
-            $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->get();
-        } else {
-            $overdues = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->get();
-        }
-$i = count($overdues);
-if ($i == 0) {
-            $overdue_ticket = 0;
-        } else {
-            $j = 0;
-            foreach ($overdues as $overdue) {
-                $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id', '=', $overdue->sla)->first();
-
-                $ovadate = $overdue->created_at;
-                $new_date = date_add($ovadate, date_interval_create_from_date_string($sla_plan->grace_period)).'<br/><br/>';
-                if (date('Y-m-d H:i:s') > $new_date) {
-                    $j++;
-                    //$value[] = $overdue;
-                }
-            }
-            // dd(count($value));
-            if ($j > 0) {
-                $overdue_ticket = $j;
-            } else {
-                $overdue_ticket = 0;
-            }
-        }
-?>
-                                        <li @yield('inbox')>
-                                            <a href="{{ url('/ticket/inbox') }}" id="load-inbox">
-                                                <i class="fa fa-envelope"></i> <span>{!! Lang::get('lang.inbox') !!}</span> <small class="label pull-right bg-green"><?php echo count($tickets); ?></small>                                            </a>
-                                        </li>
-                                        <li @yield('myticket')>
-                                             <a href="{{url('ticket/myticket')}}" id="load-myticket">
-                                                <i class="fa fa-user"></i> <span>{!! Lang::get('lang.my_tickets') !!} </span>
-                                                <small class="label pull-right bg-green">{{count($myticket) }}</small>
-                                            </a>
-                                        </li>
-                                        <li @yield('unassigned')>
-                                            <a href="{{url('unassigned')}}" id="load-unassigned">
-                                                <i class="fa fa-th"></i> <span>{!! Lang::get('lang.unassigned') !!}</span>
-                                                <small class="label pull-right bg-green">{{count($unassigned)}}</small>
-                                            </a>
-                                        </li>
-                                        <li @yield('overdue')>
-                                            <a href="{{url('ticket/overdue')}}" id="load-unassigned">
-                                                <i class="fa fa-calendar-times-o"></i> <span>{!! Lang::get('lang.overdue') !!}</span>
-                                                <small class="label pull-right bg-green">{{$overdue_ticket}}</small>
-                                            </a>
-                                        </li>
-                                        <li @yield('trash')>
-                                            <a href="{{url('trash')}}">
-                                                <i class="fa fa-trash-o"></i> <span>{!! Lang::get('lang.trash') !!}</span>
-                                                <small class="label pull-right bg-green">{{count($deleted)}}</small>
-                                            </a>
-                                        </li>
-<li class="header">{!! Lang::get('lang.Departments') !!}</li>
-<?php
-$depts = App\Model\helpdesk\Agent\Department::all();
-foreach ($depts as $dept) {
-$open = App\Model\helpdesk\Ticket\Tickets::where('status','=','1')->where('isanswered', '=', 0)->where('dept_id','=',$dept->id)->get();
-$open = count($open);
-$underprocess = App\Model\helpdesk\Ticket\Tickets::where('status','=','1')->where('assigned_to','>', 0)->where('dept_id','=',$dept->id)->get();
-$underprocess = count($underprocess);
-$closed = App\Model\helpdesk\Ticket\Tickets::where('status','=','2')->where('dept_id','=',$dept->id)->get();
-$closed = count($closed);
-    // $underprocess = 0;
-    // foreach ($inbox as $ticket4) {
-    //  if ($ticket4->assigned_to == null) {
-    //  } else {
-    //      $underprocess++;
-    //  }
-    // }
-if (Auth::user()->role == 'admin') { ?>
-                                        <li class="treeview">
-                                            <a href="#">
-                                                <i class="fa fa-folder-open"></i> <span>{!! $dept->name !!}</span> <i class="fa fa-angle-left pull-right"></i>
-                                            </a>
-                                            <ul class="treeview-menu">
-                                                <li><a href="{!! url::route('dept.open.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.open') !!}<small class="label pull-right bg-green">{!! $open !!}</small></a></li>
-                                                <li><a href="{!! url::route('dept.inprogress.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.inprogress') !!}<small class="label pull-right bg-green">{!! $underprocess !!}</small></a></li>
-                                                <li><a href="{!! url::route('dept.closed.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.closed') !!}<small class="label pull-right bg-green">{!! $closed !!}</small></a></li>
-                                            </ul>
-                                        </li>
-<?php } if (Auth::user()->role == 'agent' && Auth::user()->primary_dpt == $dept->id) { ?>
-                                        <li class="treeview">
-                                            <a href="#">
-                                                <i class="fa fa-folder-open"></i> <span>{!! $dept->name !!}</span> <i class="fa fa-angle-left pull-right"></i>
-                                            </a>
-                                            <ul class="treeview-menu">
-                                                <li><a href="{!! url::route('dept.open.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.open') !!}<small class="label pull-right bg-green">{!! $open !!}</small></a></li>
-                                                <li><a href="{!! url::route('dept.inprogress.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.inprogress') !!}<small class="label pull-right bg-green">{!! $underprocess !!}</small></a></li>
-                                                <li><a href="{!! url::route('dept.closed.ticket',$dept->name) !!}"><i class="fa fa-circle-o"></i>{!! Lang::get('lang.closed') !!}<small class="label pull-right bg-green">{!! $closed !!}</small></a></li>
-                                            </ul>
-                                        </li>
-<?php } }  ?>
-                        </ul>
-                        </section>
-                        <!-- /.sidebar -->
-                        </aside>
-<?php $agent_group = Auth::user()->assign_group;
-$group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->where('group_status', '=', '1')->first();
-// dd($group); ?>
-                        <!-- Right side column. Contains the navbar and content of the page -->
-                        <div class="content-wrapper">
-                            <!-- Content Header (Page header) -->
-                            <div class="tab-content" style="background-color: white;padding: 0 20px 0 20px">
-                                <div class="collapse navbar-collapse" id="navbar-collapse">
-                                    <div class="tabs-content">
-                                        <div class="tabs-pane @yield('dashboard-bar')"  id="tabA">
-                                            <ul class="nav navbar-nav">
-                                                <li id="bar" @yield('dashboard') ><a href="{{url('dashboard')}}">{!! Lang::get('lang.dashboard') !!}</a></li>
-                                                <li id="bar" @yield('profile') ><a href="{{url('profile')}}">{!! Lang::get('lang.profile') !!}</a></li>
-                                            </ul>
-                                        </div>
-                                        <div class="tabs-pane @yield('user-bar')" id="tabB">
-                                            <ul class="nav navbar-nav">
-                                                <li id="bar" @yield('user')><a href="{{ url('user') }}" >{!! Lang::get('lang.user_directory') !!}</a></li></a></li>
-                                                <li id="bar" @yield('organizations')><a href="{{ url('organizations') }}" >{!! Lang::get('lang.organizations') !!}</a></li></a></li>
-                                            </ul>
-                                        </div>
-                                        <div class="tabs-pane @yield('ticket-bar')" id="tabC">
-                                            <ul class="nav navbar-nav">
-                                                <li id="bar" @yield('open')><a href="{{ url('/ticket/open') }}" id="load-open">{!! Lang::get('lang.open') !!}</a></li>
-                                                <li id="bar" @yield('answered')><a href="{{ url('/ticket/answered') }}" id="load-answered">{!! Lang::get('lang.answered') !!}</a></li>
-                                                <li id="bar" @yield('myticket')><a href="{{ url('/ticket/myticket') }}" >{!! Lang::get('lang.my_tickets') !!}</a></li>
-                                                {{-- <li id="bar" @yield('ticket')><a href="{{ url('ticket') }}" >Ticket</a></li> --}}
-                                                {{-- <li id="bar" @yield('overdue')><a href="{{ url('/ticket/overdue') }}" >Overdue</a></li> --}}
-                                                <li id="bar" @yield('assigned')><a href="{{ url('/ticket/assigned') }}" id="load-assigned" >{!! Lang::get('lang.assigned') !!}</a></li>
-                                                <li id="bar" @yield('closed')><a href="{{ url('/ticket/closed') }}" >{!! Lang::get('lang.closed') !!}</a></li>
-                                                <?php if ($group->can_create_ticket == 1) {?>
-                                                <li id="bar" @yield('newticket')><a href="{{ url('/newticket') }}" >{!! Lang::get('lang.create_ticket') !!}</a></li>
-                                                <?php } ?>
-                                            </ul>
-                                        </div>
-                                        <div class="tabs-pane @yield('tools-bar')" id="tabD">
-                                            <ul class="nav navbar-nav">
-                                                <li id="bar" @yield('tools')><a href="{{ url('/canned/list') }}" >{!! Lang::get('lang.canned_response') !!}</a></li>
-                                                <li id="bar" @yield('kb')><a href="{{ url('/comment') }}" >{!! Lang::get('lang.knowledge_base') !!}</a></li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <section class="content-header">
-                                @yield('PageHeader')
-                                @yield('breadcrumbs')
-                            </section>
-                            <!-- Main content -->
-                            <section class="content">
-                                @yield('content')
-                            </section><!-- /.content -->
-                        </div>
-                        <footer class="main-footer">
-                            <div class="pull-right hidden-xs">
-                                <b>Version</b> {!! Config::get('app.version') !!}
-                            </div>
-            <strong>{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}" target="_blank">{!! $company->company_name !!}</a>.</strong> {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/" target="_blank">Faveo</a>
-                        </footer>
-                    </div><!-- ./wrapper -->
-                    {{-- // <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> --}}
-
-                     <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}"></script>
-                    
-                    {{-- // <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.7.14/js/bootstrap-datetimepicker.min.js"></script> --}}
-
-                    <script src="{{asset("lb-faveo/js/bootstrap-datetimepicker4.7.14.min.js")}}" type="text/javascript"></script>
-                    <!-- Bootstrap 3.3.2 JS -->
-                    <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
-                    <!-- Slimscroll -->
-                    <script src="{{asset("lb-faveo/plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
-                    <!-- FastClick -->
-                    <script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}"></script>
-                    <!-- AdminLTE App -->
-                    <script src="{{asset("lb-faveo/js/app.min.js")}}" type="text/javascript"></script>
-                    <!-- AdminLTE for demo purposes -->
-                    {{-- // <script src="{{asset("dist/js/demo.js")}}" type="text/javascript"></script> --}}
-                    <!-- iCheck -->
-                    <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
-                    {{-- maskinput --}}
-                    {{-- // <script src="js/jquery.maskedinput.min.js" type="text/javascript"></script> --}}
-                    {{-- jquery ui --}}
-                    <script src="{{asset("lb-faveo/js/jquery.ui.js")}}" type="text/javascript"></script>
-                    <script src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}" type="text/javascript"></script>
-                    <script src="{{asset("lb-faveo/plugins/datatables/jquery.dataTables.js")}}" type="text/javascript"></script>
-                    <!-- Page Script -->
-                    
-                    {{-- // <script type="text/javascript" src="https://cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js"></script> --}}
-                    <script type="text/javascript" src="{{asset("lb-faveo/js/jquery.dataTables1.10.10.min.js")}}"></script>
-                    
-                    <script type="text/javascript" src="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.js")}}"></script>
-                    <script src="{{asset("lb-faveo/js/jquery.rating.pack.js")}}" type="text/javascript"></script>
-
-                     <script src="{{asset("lb-faveo/plugins/select2/select2.full.min.js")}}" ></script>
-                      <script src="{{asset("lb-faveo/plugins/moment/moment.js")}}" ></script>
-<script>
-                function myFunction() {
-
-                    document.getElementById("count").innerHTML = "0";
-
-                }
-        </script>
-        <script>
-                $(document).ready(function () {
-                    
-                    $('.noti_User').click(function () {
-                        var id = this.id;
-                    var dataString = 'id=' + id;
-                        $.ajax
-                                ({
-                                    type: "POST",
-                                    url: "{{url('mark-read')}}" + "/" + id,
-                                    data: dataString,
-                                    cache: false,
-                                    success: function (html)
-                                    {
-//$(".city").html(html);
-                                    }
-                                });
-                    });
-
-                });
-        </script>
-<script>
-$(function() {
-    // Enable iCheck plugin for checkboxes
-    // iCheck for checkbox and radio inputs
-    // $('input[type="checkbox"]').iCheck({
-        // checkboxClass: 'icheckbox_flat-blue',
-        // radioClass: 'iradio_flat-blue'
-    // });
-    // Enable check and uncheck all functionality
-    $(".checkbox-toggle").click(function() {
-        var clicks = $(this).data('clicks');
-        if (clicks) {
-            //Uncheck all checkboxes
-            $("input[type='checkbox']", ".mailbox-messages").iCheck("uncheck");
-        } else {
-            //Check all checkboxes
-            $("input[type='checkbox']", ".mailbox-messages").iCheck("check");
-        }
-        $(this).data("clicks", !clicks);
-    });
-
-    //Handle starring for glyphicon and font awesome
-    $(".mailbox-star").click(function(e) {
-        e.preventDefault();
-        //detect type
-        var $this = $(this).find("a > i");
-        var glyph = $this.hasClass("glyphicon");
-        var fa = $this.hasClass("fa");
-        //Switch states
-        if (glyph) {
-            $this.toggleClass("glyphicon-star");
-            $this.toggleClass("glyphicon-star-empty");
-        }
-        if (fa) {
-            $this.toggleClass("fa-star");
-            $this.toggleClass("fa-star-o");
-        }
-    });
-});
-                    </script>
-                    <script type="text/javascript">
-                        //     $(document).ready(function() {
-                        //         $("#content").Editor();
-                        //     });
-                        // </script>
-                   <!-- // <script src="../plugins/jQuery/jQuery-2.1.3.min.js"></script> -->
-                    <script src="{{asset("lb-faveo/js/tabby.js")}}"></script>
-                     <!-- // <script src="{{asset("dist/js/editor.js")}}"></script> -->
-                    <!-- CK Editor -->
-                    <!-- // <script src="{{asset("//cdn.ckeditor.com/4.4.3/standard/ckeditor.js")}}"></script> -->
-                    {{-- // <script src="{{asset("lb-faveo/downloads/CKEditor.js")}}"></script> --}}
-                    <script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
-                    <script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
-                    <script>
-                        // $(function () {
-                        // //Add text editor
-                        // $("textarea").wysihtml5();
-                        // });
-                    </script>
-                    <script type="text/javascript">
-                        $.ajaxSetup({
-                               headers: { 'X-CSRF-Token' : $('meta[name=_token]').attr('content') }
-                                });
-                    </script>
-                    @yield('FooterInclude')
-                </body>
-            </html>

resources/views/themes/default1/agent/layout/elements/rating.blade.php

@@ -0,0 +1,3 @@
+@section('content')
+hello sujit
+@stop

resources/views/themes/default1/agent/layout/kb.blade.php

@@ -12,7 +12,7 @@
         <link href="http://code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css" rel="stylesheet" type="text/css" />
         <!-- fullCalendar 2.2.5-->
         <link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.min.css")}}" rel="stylesheet" type="text/css" />
-        
+
         <link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.print.css")}}" rel="stylesheet" type="text/css" media='print' />
         <!-- Theme style -->
         <link href="{{asset("lb-faveo/dist/css/AdminLTE.min.css")}}" rel="stylesheet" type="text/css" />
@@ -23,19 +23,17 @@
         <link href="{{asset("lb-faveo/plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <link rel="stylesheet" href="{{asset("lb-faveo/dist/css/tabby.css")}}" type="text/css">
-        
+
         <link href="http://www.jqueryscript.net/css/jquerysctipttop.css" rel="stylesheet" type="text/css">
-        
+
         <link type="text/css" href="http://code.jquery.com/ui/1.9.1/themes/redmond/jquery-ui.css" rel="stylesheet">
-        
+
         <link href="http://www.jqueryscript.net/css/jquerysctipttop.css" rel="stylesheet" type="text/css">
-        
+
         <script type="text/javascript" src="//cdn.datatables.net/1.10.0/js/jquery.dataTables.js"></script>
-        
-        <link href="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" rel="stylesheet" type="text/css" />
-        
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-        
+
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+
         <script type="text/javascript" src="{{asset('lb-faveo/dist/js/nicEdit.js')}}"></script>
 
         @yield('HeadInclude')
@@ -74,7 +72,7 @@
                                     @else
                                         <img src="{{ Gravatar::src(Auth::user()->email) }}" class="user-image" alt="User Image">
                                     @endif
-                                @endif          
+                                @endif
                                     <span class="hidden-xs">{!! Auth::user()->firstname." ".Auth::user()->lastname !!}</span>
                                 </a>
                                 <ul class="dropdown-menu">
@@ -86,7 +84,7 @@
                                     @else
                                         <img src="{{ Gravatar::src(Auth::user()->email) }}" class="img-circle" alt="User Image">
                                     @endif
-                                @endif          
+                                @endif
                                         <p>
                                             <span class="hidden-xs">{!! Auth::user()->firstname." ".Auth::user()->lastname !!}</span>
                                         </p>
@@ -241,8 +239,8 @@
             </footer>
         </div><!-- ./wrapper -->
 
-        <!-- jQuery 2.1.3 -->
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+        <!-- jQuery 2.1.1 -->
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 
         <!-- Bootstrap 3.3.2 JS -->
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
@@ -256,9 +254,9 @@
         <script src="{{asset("lb-faveo/dist/js/app.min.js")}}" type="text/javascript"></script>
         <!-- iCheck -->
         <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
-        
+
         <script type="text/javascript" src="js/jquery.maskedinput.min.js"></script>
-        
+
         <script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
         <!-- Bootstrap WYSIHTML5 -->
         <script src="{{asset('lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js')}}" type="text/javascript"></script>

resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php

@@ -16,9 +16,11 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
             </div> 
             <div class="col-md-3">
                 <div class="pull-right">
+
                     <!-- <button type="button" class="btn btn-default"><i class="fa fa-edit" style="color:green;"> </i> Edit</button> -->                            
                     {{-- <button type="button" class="btn btn-default"><i class="fa fa-print" style="color:blue;"> </i> {!! link_to_route('ticket.print','Print',[$tickets->id]) !!}</button> --}}
                     <!-- </div> -->
+                    @if( $common_setting->status == '1')
                     <div class="btn-group"> 
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-exchange" style="color:teal;"> </i> 
                             {!! Lang::get('lang.change_status') !!} <span class="caret"></span>
@@ -30,7 +32,7 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
                             <li><a href="#" id="close"><i class="fa fa-check" style="color:#15F109;"> </i>{!! Lang::get('lang.close') !!}</a></li>
                             <li><a href="#" id="resolved"><i class="fa fa-check-circle " style="color:#0EF1BE;"> </i> {!! Lang::get('lang.resolved') !!}</a></li>
                         </ul>
-                    </div>
+                    </div>@endif
                     {!! Form::close() !!}
                 </div>
             </div>
@@ -451,7 +453,7 @@ foreach ($conversations as $conversation) {
         //Add text editor
         $("textarea").wysihtml5();
     });
-
+@if( $common_setting->status == '1')
     jQuery(document).ready(function() {
         // Close a ticket
         $('#close').on('click', function(e) {
@@ -538,6 +540,8 @@ foreach ($conversations as $conversation) {
             })
             return false;
         });
+    @endif
+
     });
 </script>
 @stop

resources/views/themes/default1/client/helpdesk/ckeckticket2.blade.php

@@ -238,7 +238,7 @@ foreach ($conversations as $conversation) {
                                             <footer class="comment-meta"<?php if($role->role == "user") { ?> style="background-color: hsla(100, 100%, 51%, 0.15)" <?php } else { ?> style="background-color:#FFFCB3" <?php } ?>  > 
                                                 <div class="comment-author">
                                                         @if($role->profile_pic)
-                                                            <img src="{{asset('lb-faveo/media/profilepic')}}{{'/'}}{{$role->profile_pic}}"alt="" height="50" width="50" class="avatar" <?php if($role->role == "user") { ?>style="box-shadow: 0 1px 3px #00FF26;" <?php } else { ?> style="box-shadow: 0 1px 3px #FFEC00;" <?php } ?> >
+                                                            <img src="{{asset('uploads/profilepic')}}{{'/'}}{{$role->profile_pic}}"alt="" height="50" width="50" class="avatar" <?php if($role->role == "user") { ?>style="box-shadow: 0 1px 3px #00FF26;" <?php } else { ?> style="box-shadow: 0 1px 3px #FFEC00;" <?php } ?> >
                                                         @else
                                                             <img src="{{ Gravatar::src($role->email) }}" alt="" height="50" width="50" class="avatar" <?php if($role->role == "user") { ?>style="box-shadow: 0 1px 3px #00FF26;" <?php } else { ?> style="box-shadow: 0 1px 3px #FFEC00;" <?php } ?> >
                                                         @endif

resources/views/themes/default1/client/helpdesk/form.blade.php

@@ -34,13 +34,9 @@ class = "active"
     @endif
     <div class="banner-content text-center">
         {!! Form::open(['url' => 'checkmyticket' , 'method' => 'POST'] )!!}
-
         {!! Form::label('email',Lang::get('lang.email')) !!}<span class="text-red"> *</span>
-
         {!! Form::text('email_address',null,['class' => 'form-control']) !!}
-
         {!! Form::label('ticket_number',Lang::get('lang.ticket_number')) !!}<span class="text-red">*</span>
-
         {!! Form::text('ticket_number',null,['class' => 'form-control']) !!}
         <br/><input type="submit" value="{!! Lang::get('lang.check_ticket_status') !!}" class="btn btn-info">
         {!! Form::close() !!}
@@ -57,7 +53,6 @@ class = "active"
         {!! Session::get('message') !!}
     </div>
     @endif
-
     @if (count($errors) > 0)
     @if(Session::has('check'))
     <?php goto a; ?>
@@ -74,7 +69,6 @@ class = "active"
     </div>
     <?php a: ?>
     @endif
-
     <!-- open a form -->
     {{-- <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script> --}}
     <script src="{{asset("lb-faveo/js/jquery2.0.2.min.js")}}" type="text/javascript"></script>
@@ -99,87 +93,87 @@ class = "active"
                 {!! $errors->first('help_topic', '<spam class="help-block">:message</spam>') !!}
                 <?php
                 $forms = App\Model\helpdesk\Form\Forms::get();
-                $helptopic = App\Model\helpdesk\Manage\Help_topic::get();
+                $helptopic = App\Model\helpdesk\Manage\Help_topic::where('status', '=', 1)->get();
                 ?>                  
                 <select name="helptopic" class="form-control" id="selectid">
                     <?php
                     $system_default_department = App\Model\helpdesk\Settings\System::where('id', '=', 1)->first();
-                    if ($system_default_department->department) {
+                    if (isset($system_default_department->department)) {
                         $department_relation_helptopic = App\Model\helpdesk\Manage\Help_topic::where('department', '=', $system_default_department->department)->first();
                         $default_helptopic = $department_relation_helptopic->id;
                     } else {
                         $default_helptopic = 0;
                     }
-                    ?>  
+                    ?>
                     @foreach($helptopic as $topic)
                     <option value="{!! $topic->id !!}">{!! $topic->topic !!}</option>
                     @endforeach
-
                 </select>
             </div>
-            <div class="col-md-12 form-group {{ $errors->has('Name') ? 'has-error' : '' }}">
+            
+                @if(Auth::user())
+                    
+                        {!! Form::hidden('Name',Auth::user()->user_name,['class' => 'form-control']) !!}
+                    
+                @else
+                    <div class="col-md-12 form-group {{ $errors->has('Name') ? 'has-error' : '' }}">
+                        {!! Form::label('Name',Lang::get('lang.name')) !!}<span class="text-red"> *</span>
+                        {!! Form::text('Name',null,['class' => 'form-control']) !!}
+                    </div>
+                @endif
+            
+            
 
-                {!! Form::label('Name',Lang::get('lang.name')) !!}<span class="text-red"> *</span>
+                @if(Auth::user())
+                    
+                        {!! Form::hidden('Email',Auth::user()->email,['class' => 'form-control']) !!}
+                    
+                @else
+                    <div class="col-md-12 form-group {{ $errors->has('Email') ? 'has-error' : '' }}">
+                        {!! Form::label('Email',Lang::get('lang.email')) !!}<span class="text-red"> *</span>
+                        {!! Form::text('Email',null,['class' => 'form-control']) !!}
+                    </div>
+                @endif
 
-                {!! Form::text('Name',null,['class' => 'form-control']) !!}
 
-            </div>
 
-            <div class="col-md-12 form-group {{ $errors->has('Email') ? 'has-error' : '' }}">
-
-                {!! Form::label('Email',Lang::get('lang.email')) !!}<span class="text-red"> *</span>
-
-                {!! Form::text('Email',null,['class' => 'form-control']) !!}
-
-            </div>
+                
+            
+                @if(!Auth::user())
+                    
             <div class="col-md-2 form-group {{ Session::has('country_code_error') ? 'has-error' : '' }}">
-
                 {!! Form::label('Code',Lang::get('lang.country-code')) !!}
-
                 {!! Form::text('Code',null,['class' => 'form-control', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code')]) !!}
             </div>
             <div class="col-md-5 form-group {{ $errors->has('Phone') ? 'has-error' : '' }}">
-
                 {!! Form::label('Mobile',Lang::get('lang.mobile_number')) !!}
-
                 {!! Form::text('Mobile',null,['class' => 'form-control']) !!}
-
             </div>
             <div class="col-md-5 form-group {{ $errors->has('Phone') ? 'has-error' : '' }}">
-
                 {!! Form::label('Phone',Lang::get('lang.phone')) !!}
-
                 {!! Form::text('Phone',null,['class' => 'form-control']) !!}
             </div>
-            <div class="col-md-5 form-group {{ $errors->has('Phone') ? 'has-error' : '' }}">
-
-                {!! Form::label('Subject',Lang::get('lang.subject')) !!}
-
-                {!! Form::text('Subject',null,['class' => 'form-control']) !!}
-
-            </div>
+              @endif
             <div class="col-md-12 form-group {{ $errors->has('Subject') ? 'has-error' : '' }}">
-
+                {!! Form::label('Subject',Lang::get('lang.subject')) !!}<span class="text-red"> *</span>
+                {!! Form::text('Subject',null,['class' => 'form-control']) !!}
+            </div>
+            <div class="col-md-12 form-group {{ $errors->has('Details') ? 'has-error' : '' }}">
                 {!! Form::label('Details',Lang::get('lang.message')) !!}<span class="text-red"> *</span>
-
                 {!! Form::textarea('Details',null,['class' => 'form-control']) !!}
-
             </div>
             <div class="col-md-12 form-group">
-
                 <div class="btn btn-default btn-file"><i class="fa fa-paperclip"> </i> {!! Lang::get('lang.attachment') !!}<input type="file" name="attachment[]" multiple/></div><br/>
                 {!! Lang::get('lang.max') !!}. 10MB
             </div>
             {{-- Event fire --}}
             <?php Event::fire(new App\Events\ClientTicketForm()); ?>
-
             <div class="col-md-12" id="response"> </div>
             <div id="ss" class="xs-md-6 form-group {{ $errors->has('') ? 'has-error' : '' }}"> </div>
             <div class="col-md-12 form-group">{!! Form::submit(Lang::get('lang.Send'),['class'=>'form-group btn btn-info pull-left'])!!}</div>
         </div>
         <div class="col-md-12" id="response"> </div>
         <div id="ss" class="xs-md-6 form-group {{ $errors->has('') ? 'has-error' : '' }}"> </div>
-
     </div>
     {!! Form::close() !!}
 </div>
@@ -189,7 +183,6 @@ class = "active"
 |====================================================
 -->
 <script type="text/javascript">
-
 $('#selectid').on('change', function() {
     var value = $('#selectid').val();
     $.ajax({
@@ -198,7 +191,7 @@ $('#selectid').on('change', function() {
         data: value,
         success: function(data) {
             $('#response').html(data);
-            //location.reload();
+            var wysihtml5Editor = $('#unique-textarea').wysihtml5().data("wysihtml5").editor;
         }
     });
 });
@@ -207,7 +200,5 @@ $(function() {
 //Add text editor
     $("textarea").wysihtml5();
 });
-
 </script>
-
 @stop

resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php

@@ -33,12 +33,18 @@
                 </a>
             </span>
         @endif
-        @if(App\Model\helpdesk\Settings\System::first()->status == 1)
-            <span onclick="javascript: window.location.href='{!! URL::route('form') !!}';">
-                <a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/submitticket.png');">
-                    <span class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</span>
-                </a>
-            </span>
+        <?php $system = App\Model\helpdesk\Settings\System::where('id', '=', '1')->first();            
+        ?>
+        @if($system != null) 
+            @if($system->status) 
+                @if($system->status == 1)
+                    <span onclick="javascript: window.location.href='{!! URL::route('form') !!}';">
+                        <a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/submitticket.png');">
+                            <span class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</span>
+                        </a>
+                    </span>
+                @endif
+            @endif
         @endif
             <span onclick="javascript: window.location.href='{{url('mytickets')}}';">
                 <a href="{{url('mytickets')}}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/news.png');">
@@ -53,7 +59,7 @@
         </div>
     </div>
 <script type="text/javascript"> $(function(){ $('.dialogerror, .dialoginfo, .dialogalert').fadeIn('slow');$("form").bind("submit", function(e){$(this).find("input:submit").attr("disabled", "disabled");});});</script>
-				<script type="text/javascript" >try {if (top.location.hostname != self.location.hostname) { throw 1; }} catch (e) { top.location.href = self.location.href; }</script>
+<script type="text/javascript" >try {if (top.location.hostname != self.location.hostname) { throw 1; }} catch (e) { top.location.href = self.location.href; }</script>
 </div>   
 
 @stop

resources/views/themes/default1/client/helpdesk/mytickets.blade.php

@@ -77,7 +77,9 @@ class="active"
                                     $stringCut = substr($string, 0, 40);
                                     $string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
                                 }
-                                $TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
+                                $TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)
+                                    ->where('user_id', '!=' , null)
+                                    ->max('id');
                                 $TicketDatarow = App\Model\helpdesk\Ticket\Ticket_Thread::where('id', '=', $TicketData)->first();
                                 $LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first();
                                 if ($LastResponse->role == "user") {
@@ -90,7 +92,7 @@ class="active"
                                         $username = $LastResponse->user_name;
                                     }
                                 }
-                                $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
+                                $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->where('is_internal', '=', 0)->get();
                                 $count = count($titles);
                                 foreach ($titles as $title) {
                                     $title = $title;
@@ -177,7 +179,7 @@ class="active"
                                         $username = $LastResponse->user_name;
                                     }
                                 }
-                                $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
+                                $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->where("is_internal", "=", 0)->get();
                                 $count = count($titles);
                                 foreach ($titles as $title) {
                                     $title = $title;

resources/views/themes/default1/client/kb/article-list/home.blade.php

@@ -66,7 +66,7 @@ class = "active"
                             $article = $article->where('status', '1');
                         }
                         $article = $article->where('type', '1');
-                        $article = $article->get();
+                        $article = $article->orderBy('publish_time','desc')->get();
                         ?>
                         @forelse($article as $arti)
                         <li>
@@ -77,7 +77,7 @@ class = "active"
                             $str = $arti->description;
                             $len = strlen($str);
 
-                            $excerpt = App\Http\Controllers\Client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 50);
+                            $excerpt = App\Http\Controllers\Client\kb\UserController::getExcerpt($str, $startPos = 0, $maxLength = 20);
                             ?>
                             {!! strip_tags($excerpt) !!} <br/><a class="more-link text-center" href="{{url('show/'.$arti->slug)}}" style="color: orange">{!! Lang::get('lang.read_more') !!}</a>
                         </li>

resources/views/themes/default1/client/kb/article-list/pages.blade.php

@@ -1,14 +1,4 @@
 @extends('themes.default1.client.layout.client')
-@section('breadcrumb')
-<div class="site-hero clearfix">
-
-    <ol class="breadcrumb breadcrumb-custom">
-        <li class="text">{!! Lang::get('lang.you_are_here') !!}: </li>
-        <li class="active">{{$page->name}}</li>
-
-    </ol>
-</div>
-@stop
 @section('content')
 
 <!-- Start of Page Container -->

resources/views/themes/default1/client/layout/client.blade.php

@@ -12,31 +12,31 @@
         ?>
         <title> @yield('title') {!! strip_tags($title_name) !!} </title>
         <!-- faveo favicon -->
-        <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
+        <link href="{{asset("lb-faveo/media/images/favicon.ico")}}"  rel="shortcut icon" >
+        
         <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
         <!-- Bootstrap 3.3.2 -->
-        {{-- <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> --}}
         <link href="{{asset("lb-faveo/css/bootstrap.min.css")}}" rel="stylesheet" type="text/css" />
+        <!-- Admin LTE CSS -->
         <link href="{{asset("lb-faveo/css/AdminLTEsemi.css")}}" rel="stylesheet" type="text/css" />
         <!-- Font Awesome Icons -->
-        {{-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" /> --}}
         <link href="{{asset("lb-faveo/css/font-awesome.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- Ionicons -->
-        {{-- <link href="http://code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css" rel="stylesheet" type="text/css" /> --}}
         <link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- fullCalendar 2.2.5-->
         <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- Theme style -->
         <link href="{{asset("lb-faveo/css/jquery.rating.css")}}" rel="stylesheet" type="text/css" />
+        
         <link href="{{asset("lb-faveo/css/app.css")}}" rel="stylesheet" type="text/css" />
+        
         <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
 
-        {{-- // <script src="ckeditor/ckeditor.js"></script> --}}
         <!--[if lt IE 9]>
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
             <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
         <![endif]-->
-        {{-- // <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> --}}
+
         <script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
         @yield('HeadInclude')
     </head>
@@ -55,7 +55,7 @@
                             <a href="{{url('/')}}" rel="home">
                                 @endif
                                 @if($company->use_logo == 1)
-                                <img src="{{asset('lb-faveo/media/company')}}{{'/'}}{{$company->logo}}" alt="User Image" width="200px" height="200px"/>
+                                <img src="{{asset('uploads/company')}}{{'/'}}{{$company->logo}}" alt="User Image" width="200px" height="200px"/>
                                 @else
                                 @if($system->name)
                                 {!! $system->name !!}
@@ -74,8 +74,8 @@
                                 @endif
                                 <li @yield('kb')><a href="{!! url('knowledgebase') !!}">{!! Lang::get('lang.knowledge_base') !!}</a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="{{route('category-list')}}">{!! Lang::get('lang.categories') !!}</a></li>  
-                                        <li><a href="{{route('article-list')}}">{!! Lang::get('lang.articles') !!}</a></li>  
+                                        <li><a href="{{route('category-list')}}">{!! Lang::get('lang.categories') !!}</a></li>
+                                        <li><a href="{{route('article-list')}}">{!! Lang::get('lang.articles') !!}</a></li>
                                     </ul>
                                 </li>
                                 <?php $pages = App\Model\kb\Page::where('status', '1')->where('visibility', '1')->get();
@@ -117,38 +117,50 @@
                             </ul><!-- .navbar-user -->
                             @else
                             </ul>
+                            @if(isset($errors))
                             <ul class="nav navbar-nav navbar-login">
-                                <li <?php if ($errors->first('email') || $errors->first('password')) { ?> class="sfHover" <?php } else { ?> <?php } ?> ><a href="#"  data-toggle="collapse"  <?php
+                                <li 
+                                <?php
+                                if (is_object($errors)) {
                                     if ($errors->first('email') || $errors->first('password')) {
-                                        
-                                    } else {
-                                        ?> class="collapsed" <?php } ?> data-target="#login-form">{!! Lang::get('lang.login') !!} <i class="sub-indicator fa fa-chevron-circle-down fa-fw text-muted"></i></a></li>
+                                        ?> class="sfHover" 
+                                            <?php
+                                        }
+                                    }
+                                    ?> 
+                                    ><a href="#"  data-toggle="collapse"  
+                                        <?php
+                                        if (is_object($errors)) {
+                                            if ($errors->first('email') || $errors->first('password')) {
+                                                
+                                            } else {
+                                                ?> class="collapsed" 
+                                        <?php }
+                                    } ?> 
+                                    data-target="#login-form">{!! Lang::get('lang.login') !!} <i class="sub-indicator fa fa-chevron-circle-down fa-fw text-muted"></i></a></li>
                             </ul><!-- .navbar-login -->
-                            <div id="login-form" <?php if ($errors->first('email') || $errors->first('password')) { ?> class="login-form collapse fade clearfix in" <?php } else { ?> class="login-form collapse fade clearfix" <?php } ?> >
-                                {!!  Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!}  
-                                @if(Session::has('errors'))
-                                @if(Session::has('check'))
-                                <?php goto b; ?>
-                                @endif
-                                <div class="alert alert-danger alert-dismissable">
-                                        <!-- <i class="fa fa-ban"> </i> <b> {!! Lang::get('lang.alert') !!}! </b> -->
-                                    <!-- <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button> -->
+                            @endif
+                            <div id="login-form" @if(isset($errors))<?php if ($errors->first('email') || $errors->first('password')) { ?> class="login-form collapse fade clearfix in" <?php } else { ?> class="login-form collapse fade clearfix" <?php } ?>@endif >
+                                 {!!  Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!}
+                                 @if(Session::has('errors'))
+                                 @if(Session::has('check'))
+<?php goto b; ?>
+                                 @endif
+                                 <div class="alert alert-danger alert-dismissable">
                                     @if(Session::has('error'))
                                     {!! Session::get('error') !!}
                                     @else
                                     {!! Lang::get('lang.required-error') !!}
                                     @endif
                                 </div>
-                                <?php b: ?>
+<?php b: ?>
                                 @endif
-                                <div class="form-group has-feedback {{ $errors->has('email') ? 'has-error' : '' }}">
+                                <div class="form-group has-feedback @if(isset($errors)) {!! $errors->has('email') ? 'has-error' : '' !!} @endif">
                                     {!! Form::text('email',null,['placeholder'=>Lang::get('lang.e-mail'),'class' => 'form-control']) !!}
-                                    <!-- {!! $errors->first('email', '<spam class="help-block">:message</spam>') !!} -->
                                     <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
                                 </div>
-                                <div class="form-group has-feedback {{ $errors->has('password') ? 'has-error' : '' }}">
+                                <div class="form-group has-feedback @if(isset($errors)) {!! $errors->has('password') ? 'has-error' : '' !!} @endif">
                                     {!! Form::password('password',['placeholder'=>Lang::get('lang.password'),'class' => 'form-control']) !!}
-                                                <!-- {!! $errors->first('password', '<spam class="help-block">:message</spam>') !!} -->
                                     <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                                 </div>
                                 <ul class="list-unstyled pull-left">
@@ -166,25 +178,25 @@
                         <div class="form-border">
                             <div class="form-inline ">
                                 <div class="form-group">
-                                    <input type="text" name="s" class="search-field form-control input-lg" title="Enter search term" placeholder="{!! Lang::get('lang.have_a_question?_type_your_search_term_here') !!}" />
+                                    <input type="text" name="s" id="s" class="search-field form-control input-lg" title="Enter search term" placeholder="{!! Lang::get('lang.have_a_question?_type_your_search_term_here') !!}" required />
                                 </div>
-                                <button type="submit" class="search-submit btn btn-custom btn-lg pull-right">{!! Lang::get('lang.search') !!}</button>
+                                <button type="submit" class="search-submit btn btn-custom btn-lg pull-right check-s">{!! Lang::get('lang.search') !!}</button>
                             </div>
                         </div>
                         {!! Form::close() !!}
-                    </div>	                        
+                    </div>
                 </div>
             </header>
             <!-- Left side column. contains the logo and sidebar -->
             <!-- Right side column. Contains the navbar and content of the page -->
-            <div class="site-hero clearfix">                            
+            <div class="site-hero clearfix">
                 {!! Breadcrumbs::render() !!}
             </div>
             <!-- Main content -->
             <div id="main" class="site-main clearfix">
                 <div class="container">
                     <div class="content-area">
-                        <div class="row">	
+                        <div class="row">
                             @if(Session::has('success'))
                             <div class="alert alert-success alert-dismissable">
                                 <i class="fa  fa-check-circle"></i>
@@ -202,7 +214,7 @@
                             <!-- failure message -->
                             @if(Session::has('fails'))
                             @if(Session::has('check'))
-                            <?php goto a; ?>
+<?php goto a; ?>
                             @endif
                             <div class="alert alert-danger alert-dismissable">
                                 <i class="fa fa-ban"></i>
@@ -210,7 +222,7 @@
                                 <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
                                 {{Session::get('fails')}}
                             </div>
-                            <?php a: ?>
+<?php a: ?>
                             @endif
                             @yield('content')
                             <div id="sidebar" class="site-sidebar col-md-3">
@@ -226,7 +238,7 @@
                         </div>
                     </div>
                 </div>
-            </div>			
+            </div>
             <!-- /.content-wrapper -->
             <?php
             $footer1 = App\Model\helpdesk\Theme\Widgets::where('name', '=', 'footer1')->first();
@@ -257,7 +269,7 @@
                                 <section id="section-latest-news" class="section">
                                     <h2 class="section-title h4 clearfix">{!!$footer2->title!!}</h2>
                                     <div class="textwidget">
-                                        <p>{!! $footer2->value !!}</p>	
+                                        <p>{!! $footer2->value !!}</p>
                                     </div>
                                 </section><!-- #section-latest-news -->
                             </div>
@@ -297,62 +309,62 @@
                             <p class="text-muted">{!! Lang::get('lang.copyright') !!} &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}" target="_blank">{!! $company->company_name !!}</a>. {!! Lang::get('lang.all_rights_reserved') !!}. {!! Lang::get('lang.powered_by') !!} <a href="http://www.faveohelpdesk.com/"  target="_blank">Faveo</a></p>
                         </div>
                         <div class="site-social text-right col-md-6">
-                            <?php $socials = App\Model\helpdesk\Theme\Widgets::all(); ?>
+<?php $socials = App\Model\helpdesk\Theme\Widgets::all(); ?>
                             <ul class="list-inline hidden-print">
                                 @foreach($socials as $social)
                                 @if($social->name == 'facebook')
                                 @if($social->value)
-                                <li><a href="{!! $social->value !!}" class="btn btn-social btn-facebook"><i class="fa fa-facebook fa-fw"></i></a></li>
+                                <li><a href="{!! $social->value !!}" class="btn btn-social btn-facebook" target="_blank"><i class="fa fa-facebook fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "twitter")
                                 @if($social->value)
-                                <li><a href="{{ $social->value }}" class="btn btn-social btn-twitter"><i class="fa fa-twitter fa-fw"></i></a></li>
+                                <li><a href="{{ $social->value }}" class="btn btn-social btn-twitter" target="_blank"><i class="fa fa-twitter fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "google")
                                 @if($social->value)
-                                <li><a href="{{$social->value}}" class="btn btn-social btn-google-plus"><i class="fa fa-google-plus fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-google-plus" target="_blank"><i class="fa fa-google-plus fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "linkedin")
                                 @if($social->value)
-                                <li><a href="{{$social->value}}" class="btn btn-social btn-linkedin"><i class="fa fa-linkedin fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-linkedin" target="_blank"><i class="fa fa-linkedin fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "vimeo")
                                 @if($social->value)
-                                <li><a href="{{$social->value}}" class="btn btn-social btn-vimeo"><i class="fa fa-vimeo-square fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-vimeo" target="_blank"><i class="fa fa-vimeo-square fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "youtube")
                                 @if($social->value)
-                                <li><a href="{{$social->vlaue}}" class="btn btn-social btn-youtube"><i class="fa fa-youtube-play fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-youtube" target="_blank"><i class="fa fa-youtube-play fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "pinterest")
                                 @if($social->value)
-                                <li><a href="{{$social->value}}" class="btn btn-social btn-pinterest"><i class="fa fa-pinterest fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-pinterest" target="_blank"><i class="fa fa-pinterest fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "dribbble")
                                 @if($social->value)
-                                <li><a href="{{$social->value}}" class="btn btn-social btn-dribbble"><i class="fa fa-dribbble fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-dribbble" target="_blank"><i class="fa fa-dribbble fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "flickr")
                                 @if($social->value)
-                                <li><a href="{{$social->value}}" class="btn btn-social btn-flickr"><i class="fa fa-flickr fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-flickr" target="_blank"><i class="fa fa-flickr fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "instagram")
                                 @if($social->value)
-                                <li><a href="{{$social->value }}" class="btn btn-social btn-instagram"><i class="fa fa-instagram fa-fw"></i></a></li>
+                                <li><a href="{{$social->value }}" class="btn btn-social btn-instagram" target="_blank"><i class="fa fa-instagram fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @if($social->name == "rss")
                                 @if($social->value)
-                                <li><a href="{{$social->rss}}" class="btn btn-social btn-rss"><i class="fa fa-rss fa-fw"></i></a></li>
+                                <li><a href="{{$social->value}}" class="btn btn-social btn-rss" target="_blank"><i class="fa fa-rss fa-fw"></i></a></li>
                                 @endif
                                 @endif
                                 @endforeach
@@ -360,23 +372,27 @@
                         </div>
                     </div>
             </footer><!-- #colophon -->
-            <!-- jQuery 2.1.3 -->
-            {{-- // <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> --}}
+            <!-- jQuery 2.1.1 -->
             <script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
             <!-- Bootstrap 3.3.2 JS -->
-            {{-- // <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script> --}}
             <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
             <!-- Slimscroll -->
             <script src="{{asset("lb-faveo/js/superfish.js")}}" type="text/javascript"></script>
+            
             <script src="{{asset("lb-faveo/js/mobilemenu.js")}}" type="text/javascript"></script>
+            
             <script src="{{asset("lb-faveo/js/know.js")}}" type="text/javascript"></script>
+            
             <script src="{{asset("lb-faveo/js/jquery.rating.pack.js")}}" type="text/javascript"></script>
+            
             <script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
+            
             <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
+            
             <script>
-$(function() {
+$(function () {
 //Enable check and uncheck all functionality
-    $(".checkbox-toggle").click(function() {
+    $(".checkbox-toggle").click(function () {
         var clicks = $(this).data('clicks');
         if (clicks) {
             //Uncheck all checkboxes
@@ -388,7 +404,7 @@ $(function() {
         $(this).data("clicks", !clicks);
     });
 //Handle starring for glyphicon and font awesome
-    $(".mailbox-star").click(function(e) {
+    $(".mailbox-star").click(function (e) {
         e.preventDefault();
 //detect type
         var $this = $(this).find("a > i");
@@ -406,5 +422,6 @@ $(function() {
     });
 });
             </script>
+
     </body>
 </html>

resources/views/themes/default1/common/api/settings.blade.php

@@ -88,7 +88,7 @@ class="active"
                             <!-- {!! Form::radio('api_key_mandatory','1',true) !!} {{Lang::get('lang.enable')}} -->
                         </div>
                         <div class="col-xs-5">
-                             <input type="radio" name="api_key_mandatory" value="0" @if($systems->api_key_mandatory == 0) checked @endif>&nbsp;{{Lang::get('lang.enable')}}
+                             <input type="radio" name="api_key_mandatory" value="0" @if($systems->api_key_mandatory == 0) checked @endif>&nbsp;{{Lang::get('lang.disable')}}
                             <!-- {!! Form::radio('api_key_mandatory','0') !!} {{Lang::get('lang.disable')}} -->
                         </div>
                     </div>

resources/views/themes/default1/installer/helpdesk/view1.blade.php

@@ -55,7 +55,7 @@ active
             <label for="Acceptme">I accept the <a href="#openModal">License Agreement</a></label>
             </div>
             <br>
-            <p class="wc-setup-actions step">
+            <p class="setup-actions step">
                 <a href="{!! route('prerequisites') !!}"><input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue" name="accept1"></a>
                 <input type="submit" class="button button-large button-next" value="Cancel" style="float: left">
             </p>

resources/views/themes/default1/installer/helpdesk/view2.blade.php

@@ -11,6 +11,37 @@ active
 
 
 @section('content')
+
+<?php  //dd(ini_get('disable_functions')); ?> 
+
+
+<?php
+// $sets = explode(",", ini_get('disable_functions'));
+// $required_functions = ['escapeshellarg'];
+// foreach ($sets as $key) {
+//     $key = trim($key);
+//     foreach ($required_functions as $value) {
+//         if($key == $value) {
+//             if (strpos(ini_get('disable_functions'), $key) !== false) {
+//                 dd("found");
+//             } else {
+//                 dd("not - found");
+//             }
+//         }
+//     }
+// }
+// dd($sets);
+
+// // foreach ( as $key => $value) {
+// //     # code...
+// // }
+// if (strpos($to_check, $statement) !== false) {
+//             return true;
+//         } else {
+//             return false;
+//         }
+?>
+
  <div id="form-content">
 <center><h1>Environment Test</h1></center>
          @if (Session::has('fail_to_change'))
@@ -90,19 +121,27 @@ function php_config_value_to_bytes($val) {
  * to check file permissions 
  *
  */
-function checkFilePermission(&$results) {
+function checkFilePermission(&$results)
+{
+    $path2 = base_path().DIRECTORY_SEPARATOR.'storage';
+    $f2 = substr(sprintf("%o",fileperms($path2)),-3);
     if (file_exists(base_path() . DIRECTORY_SEPARATOR . "example.env")) {
         $path1 = base_path().DIRECTORY_SEPARATOR.'example.env';
         $f1 = substr(sprintf("%o",fileperms($path1)),-3);
-        if( $f1 >= '644') {
-            $results[] = new TestResult('File permission looks fine', STATUS_OK);
-            return true;
-        } else {
-            $results[] = new TestResult('File permissions needed.<ul><b>Change file permission to "644" for following files</b><li>'.$path1.'</li></ul></br>Change the permission manually on your server or <a href="change-file-permission">click here.</a>', STATUS_ERROR);
-            return false;
-        }
+    } else {
+        $f1 = '644';
+    }
+    if( $f1 >= '644' && $f2 >= '755') {
+        $results[] = new TestResult('File permission looks fine', STATUS_OK);
+        return true;
+    } else {
+        if(isset($path1)){
+        $results[] = new TestResult('File permissions needed.<ul><b>Change file permission for following files</b><li>'.$path1.'%nbsp: \'644\'</li><li>'.$path2.'%nbsp: \'755\'</li></ul></br>Change the permission manually on your server or <a href="change-file-permission">click here.</a>', STATUS_ERROR);
+        } else {
+            $results[] = new TestResult('File permissions needed.<ul><b>Change file permission to "755" for following files</b><li>'.$path2.'</li></ul></br>Change the permission manually on your server or <a href="change-file-permission">click here.</a>', STATUS_ERROR);
+        }
+        return false;
     }
-    return true;
 }
 
 /**
@@ -169,7 +208,7 @@ function validate_zend_compatibility_mode(&$results) {
 function validate_extensions(&$results) {
     $ok = true;
 
-    $required_extensions = array('mcrypt', 'openssl', 'pdo');
+    $required_extensions = array('mcrypt', 'openssl', 'pdo', 'fileinfo', 'curl', 'zip');
 
     foreach ($required_extensions as $required_extension) {
         if (extension_loaded($required_extension)) {
@@ -196,7 +235,7 @@ function validate_extensions(&$results) {
 
         // 'gd' => 'GD is used for image manipulation. Without it, system is not able to create thumbnails for files or manage avatars, logos and project icons. Please refer to <a href="http://www.php.net/manual/en/image.installation.php">this</a> page for installation instructions',
         // 'mbstring' => 'MultiByte String is used for work with Unicode. Without it, system may not split words and string properly and you can have weird question mark characters in Recent Activities for example. Please refer to <a href="http://www.php.net/manual/en/mbstring.installation.php">this</a> page for installation instructions',
-        'curl' => 'cURL is used to support various network tasks. Please refer to <a href="http://www.php.net/manual/en/curl.installation.php">this</a> page for installation instructions',
+        // 'curl' => 'cURL is used to support various network tasks. Please refer to <a href="http://www.php.net/manual/en/curl.installation.php">this</a> page for installation instructions',
         // 'iconv' => 'Iconv is used for character set conversion. Without it, system is a bit slower when converting different character set. Please refer to <a href="http://www.php.net/manual/en/iconv.installation.php">this</a> page for installation instructions',
         // 'imap' => 'IMAP is used to connect to POP3 and IMAP servers. Without it, Incoming Mail module will not work. Please refer to <a href="http://www.php.net/manual/en/imap.installation.php">this</a> page for installation instructions',
         // 'zlib' => 'ZLIB is used to read and write gzip (.gz) compressed files',
@@ -214,6 +253,30 @@ function validate_extensions(&$results) {
     return $ok;
 } // validate_extensions
 
+/**
+ * function to check if there are laravel required functions are disabled
+ */
+function checkDisabledFunctions(&$results) {
+    $ok = true;
+    $sets = explode(",", ini_get('disable_functions'));
+    $required_functions = ['escapeshellarg'];
+    // dd($required_functions,$sets);
+    foreach ($sets as $key) {
+        $key = trim($key);
+        foreach ($required_functions as $value) {
+            if($key == $value) {
+                if (strpos(ini_get('disable_functions'), $key) !== false) {
+                    $results[] = new TestResult("Function '$value' is required in order to run Faveo Helpdesk. Please check php.ini to enable this function or contact your server administrator", STATUS_ERROR);
+                    $ok = false;
+                } else {
+                    $results[] = new TestResult("All required functions found", STATUS_OK);
+                }
+            }
+        }
+    }
+    return $ok;
+}
+
 // ---------------------------------------------------
 //  Do the magic
 // ---------------------------------------------------
@@ -224,8 +287,9 @@ $php_ok = validate_php($results);
 $memory_ok = validate_memory_limit($results);
 $extensions_ok = validate_extensions($results);
 $file_permission = checkFilePermission($results);
+$required_functions = checkDisabledFunctions($results);
 ?>
-<p class="wc-setup-actions step">
+<p class="setup-actions step">
 <?php 
 foreach ($results as $result) {
     print '<span class="' . strtolower($result->status) . '">' . $result->status . '</span> &mdash; ' . $result->message . '<br/>';
@@ -233,7 +297,7 @@ foreach ($results as $result) {
 ?>
 </p>
 <?php
-if ($php_ok && $memory_ok && $extensions_ok && $file_permission ) {
+if ($php_ok && $memory_ok && $extensions_ok && $file_permission && $required_functions) {
     ?>
 </div>  
 
@@ -244,7 +308,7 @@ if ($php_ok && $memory_ok && $extensions_ok && $file_permission ) {
 
     <form action="{{URL::route('postprerequisites')}}" method="post"  class="border-line">
         <input type="hidden" name="_token" value="{{ csrf_token() }}">
-        <p class="wc-setup-actions step">
+        <p class="setup-actions step">
             <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue">
             <a href="{!! route('licence') !!}" class="button button-large button-next" style="float: left">Previous</a>
         </p>
@@ -258,7 +322,7 @@ if ($php_ok && $memory_ok && $extensions_ok && $file_permission ) {
             <div class="woocommerce-message woocommerce-tracker" >
                 <p id="fail">This system does not meet Faveo system requirements</p>
             </div>
-<p class="wc-setup-actions step">
+<p class="setup-actions step">
     <a href="{{URL::route('licence')}}" style="float: left"><button value="prev" class="button-primary button button-large">Previous</button></a>
     <button disabled="" class="button-primary button button-large button-next" style="float: right">Continue</button>
 </p> <?php

resources/views/themes/default1/installer/helpdesk/view3.blade.php

@@ -44,13 +44,11 @@ active
     </div>
     @endif
 
-
     {!! Form::open(['url'=> '/step4post']) !!}
     <table ng-controller="MainController">
         <tr>
             <td>
-                <label for="selectbox1">Database <span style="color
-                                                       : red;font-size:12px;">*</span></label>
+                <label for="selectbox1">Database <span style="color: red;font-size:12px;">*</span></label>
             </td>
             <td>
                 <div class="side-by-side clearfix moveleftthre">
@@ -68,8 +66,7 @@ active
         </tr>
         <tr>
             <td>
-                <label for="box1">Host<span style="color
-                                            : red;font-size:12px;">*</span></label>
+                <label for="box1">Host<span style="color: red;font-size:12px;">*</span></label>
             </td>
             <td>
                 <input type="text" name="host">
@@ -93,8 +90,7 @@ active
         </tr>
         <tr>
             <td>
-                <label for="box3">Database Name<span style="color
-                                                     : red;font-size:12px;">*</span></label>
+                <label for="box3">Database Name<span style="color: red;font-size:12px;">*</span></label>
             </td>
             <td>
                 <input type="text" name="databasename"> 
@@ -106,8 +102,7 @@ active
         </tr>
         <tr>
             <td>
-                <label for="box4">User Name<span style="color
-                                                 : red; font-size: 12px;">*</span></label>
+                <label for="box4">User Name<span style="color: red; font-size: 12px;">*</span></label>
             </td>
             <td>
                 <input type="text" name="username"> 
@@ -131,7 +126,7 @@ active
         </tr>
     </table>
     <br>
-    <p class="wc-setup-actions step">
+    <p class="setup-actions step">
         <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue">
         <a href="{!! route('prerequisites') !!}" class="button button-large button-next" style="float: left">Previous</a>
     </p>

resources/views/themes/default1/installer/helpdesk/view4.blade.php

@@ -91,7 +91,7 @@ if (DB_HOST && DB_USER && DB_NAME) {
     //  Validators
     // ---------------------------------------------------
 // dd($results);
-    ?><p class="wc-setup-actions step"><?php
+    ?><p class="setup-actions step"><?php
     foreach ($results as $result) {
         print '<br><span class="' . strtolower($result->status) . '">' . $result->status . '</span> &mdash; ' . $result->message . '';
     } // foreach
@@ -150,7 +150,7 @@ if (DB_HOST && DB_USER && DB_NAME) {
     </div>
 
     <div style="border-bottom: 1px solid #eee;">
-        <p class="wc-setup-actions step">
+        <p class="setup-actions step">
             <a href="{{ URL::route('account') }}" class="pull-right" id="next" style="text-color:black"><input type="submit" id="submitme" class="button-primary button button-large button-next" value="Continue"> </a>
             <a href="{{ URL::route('configuration') }}" class="button button-large button-next" style="float: left">Previous</a>
         </p>
@@ -205,7 +205,7 @@ $(document).ready(function () {
 
 
             <div  style="border-bottom: 1px solid #eee;">
-                <p class="wc-setup-actions step">
+                <p class="setup-actions step">
                     <input type="submit" id="submitme" class="button-danger button button-large button-next" style="background-color: #d43f3a;color:#fff;" value="continue" disabled>
                     <a href="{{URL::route('configuration')}}" class="button button-large button-next" style="float: left;">Previous</a>
                 </p>
@@ -214,7 +214,7 @@ $(document).ready(function () {
       <?php } // if ?>
     <div id="legend">
         {{-- <ul> --}}
-        <p class="wc-setup-actions step">
+        <p class="setup-actions step">
             <span class="ok">Ok</span> &mdash; All Ok <br/>
             <span class="warning">Warning</span> &mdash; Not a deal breaker, but it's recommended to have this installed for some features to work<br/>
             <span class="error">Error</span> &mdash; Faveo HELPDESK require this feature and can't work without it<br/>

resources/views/themes/default1/installer/helpdesk/view5.blade.php

@@ -334,7 +334,7 @@ active
             <input id="dummy-data" class="input-checkbox" type="checkbox" name="dummy-data">
             <label for="dummy-data" style="color:#3AA7D9">Install dummy data</label>
             <br><br>
-            <p class="wc-setup-actions step">
+            <p class="setup-actions step">
                 <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Install">
                 <a href="{{url('step4')}}" class="button button-large button-next" style="float: left">Previous</a>
             </p>

resources/views/themes/default1/installer/helpdesk/view6.blade.php

@@ -29,19 +29,19 @@ active
         <h1 style="text-align: center;">Your Helpdesk is Ready!</h1>
 <div class="woocommerce-message woocommerce-tracker">
                 <p>All right, sparky! You’ve made it through the installation.</p>
-                
+
             </div>
 
 
-        <div class="wc-setup-next-steps">
-            <div class="wc-setup-next-steps-first">
+        <div class="setup-next-steps">
+            <div class="setup-next-steps-first">
                 <h2>Next Steps</h2>
                 <ul>
                     <li class="setup-product"><a class="button button-primary button-large" href="{!! url('auth/login') !!}" style="float: none; text-align: center; font-size: 24px;    padding: 15px;     line-height: 1;">Login to Faveo</a>
                     </li>
                 </ul>
             </div>
-            <div class="wc-setup-next-steps-last">
+            <div class="setup-next-steps-last">
                 <h2>Learn More</h2>
                 <ul>
                     <li class="video-walkthrough"><a target="_blank" href="https://www.youtube.com/channel/UC-eqh-h241b1janp6sU7Iiw">Video walk through</a>
@@ -59,7 +59,7 @@ active
         </div>
 
 
-    <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
     <script src="{{asset("lb-faveo/js/index.js")}}"></script>
-  
+
   @stop

resources/views/themes/default1/installer/layout/installer.blade.php

@@ -4,47 +4,44 @@
         <meta name="viewport" content="width=device-width">
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <title>Faveo HELPDESK</title>
-        <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
-        <link rel="stylesheet" href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/load-styles.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/css.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/admin.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/wc-setup.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/activation.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/style.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
-        <link href="{{asset("lb-faveo/css/ggpopover.css")}}" rel="stylesheet"/>
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/prism.css")}}">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/chosen.css")}}">
+        <link href="{{asset("lb-faveo/media/images/favicon.ico")}}"  rel="shortcut icon" />
+        <link href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery.ui.css" rel="stylesheet" />
+        <link href="{{asset("lb-faveo/css/load-styles.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/css.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/admin.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/setup.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/activation.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/style.css")}}" rel="stylesheet" type="text/css" />
+        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/ggpopover.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/prism.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/css/chosen.css")}}" rel="stylesheet" type="text/css" />
     </head>
-    <body class="wc-setup wp-core-ui">
-        <h1 id="wc-logo"><a href="http://www.faveohelpdesk.com">
-            <img src="{{asset("lb-faveo/media/installer/faveo.png")}}" alt="faveo" width="
-            250px"></a></h1>
-    <ol class="wc-setup-steps">
+    <body class="setup wp-core-ui">
+        <center><a href="http://www.faveohelpdesk.com">
+            <img src="{{asset("lb-faveo/media/installer/faveo.png")}}" alt="faveo" width="250px"></a></center>
+    <ol class="setup-steps">
         <li class="@yield('license')">License Agreement</li>
         <li class="@yield('environment')">Environment Test</li>
         <li class="@yield('database')">Database Setup</li>
         <li class="@yield('locale')">Locale Information</li>
         <li class="@yield('ready')">Ready</li>
     </ol>
-    <div class="wc-setup-content">
+    <div class="setup-content">
         @yield('content')
     </div>
-    
-    
     <p style="text-align: center;"> Copyright &copy; 2015 - <?php echo date('Y')?> · Ladybird Web Solution Pvt Ltd. All Rights Reserved. Powered by <a target="_blank" href="http://www.faveohelpdesk.com">Faveo </a></p>
-    
 
+    <script src="{{asset("lb-faveo/js/ggpopover.js")}}" type="text/javascript"></script>
 
-    
-    <script src="{{asset("lb-faveo/js/ggpopover.js")}}"></script>
     <script type="text/javascript">
         $('[data-toggle="popover"]').ggpopover();
     </script>
-    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script> -->
+
     <script src="{{asset("lb-faveo/js/chosen.jquery.js")}}" type="text/javascript"></script>
-    <script src="{{asset("lb-faveo/js/prism.js")}}" type="text/javascript" charset="utf-8"></script>
+
+    <script src="{{asset("lb-faveo/js/prism.js")}}" type="text/javascript"></script>
+
     <script type="text/javascript">
         var config = {
             '.chosen-select': {},
@@ -65,5 +62,6 @@
             $(selector).chosen(config[selector]);
         }
     </script>
-    </body>
+
+</body>
 </html>

resources/views/themes/default1/installer/layout/installer2.blade.php

@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Faveo HELPDESK</title>
-        <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
-        <link rel="stylesheet" href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/load-styles.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/css.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/admin.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/wc-setup.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/activation.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/style.css")}}" type="text/css" media="all">
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
-        <link href="{{asset("lb-faveo/css/ggpopover.css")}}" rel="stylesheet"/>
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/prism.css")}}">
-        <link rel="stylesheet" href="{{asset("lb-faveo/css/chosen.css")}}">
-    </head>
-    <body class="wc-setup wp-core-ui">
-        <h1 id="wc-logo"><a href="http://www.faveohelpdesk.com">
-            <img src="{{asset("lb-faveo/media/installer/faveo.png")}}" alt="faveo" width="
-            250px"></a></h1>
-   
-    <div class="wc-setup-content">
-        @yield('content')
-    </div>
-    
-    
-    <p style="text-align: center;"> Copyright &copy; 2015 - <?php echo date('Y')?> · Ladybird Web Solution Pvt Ltd. All Rights Reserved. Powered by <a target="_blank" href="http://www.faveohelpdesk.com">Faveo </a></p>
-    
-
-
-    
-    <script src="{{asset("lb-faveo/js/ggpopover.js")}}"></script>
-    <script type="text/javascript">
-        $('[data-toggle="popover"]').ggpopover();
-    </script>
-    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script> -->
-    <script src="{{asset("lb-faveo/js/chosen.jquery.js")}}" type="text/javascript"></script>
-    <script src="{{asset("lb-faveo/js/prism.js")}}" type="text/javascript" charset="utf-8"></script>
-    <script type="text/javascript">
-        var config = {
-            '.chosen-select': {},
-            '.chosen-select-deselect': {
-                allow_single_deselect: true
-            },
-            '.chosen-select-no-single': {
-                disable_search_threshold: 10
-            },
-            '.chosen-select-no-results': {
-                no_results_text: 'Oops, nothing found!'
-            },
-            '.chosen-select-width': {
-                width: "95%"
-            }
-        }
-        for (var selector in config) {
-            $(selector).chosen(config[selector]);
-        }
-    </script>
-    </body>
-</html>

resources/views/themes/default1/layouts/admin.blade.php

@@ -25,7 +25,6 @@
         <link href="{{asset("lb-faveo/downloads/jquerysctipttop.css")}}" rel="stylesheet" type="text/css">
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <link rel="stylesheet" href="{{asset("lb-faveo/dist/css/editor.css")}}" type="text/css">
-        <link href="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" rel="stylesheet" type="text/css" />
         <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
         <!--[if lt IE 9]>
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>

resources/views/themes/default1/layouts/agent.blade.php

@@ -25,16 +25,15 @@
         <link href="{{asset("lb-faveo/downloads/jquerysctipttop.css")}}" rel="stylesheet" type="text/css">
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <link rel="stylesheet" href="{{asset("lb-faveo/dist/css/editor.css")}}" type="text/css">
-        <link href="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" rel="stylesheet" type="text/css" />
         {{-- jquery ui css --}}
         <link type="text/css" href="{{asset("lb-faveo/downloads/jquery.ui.css")}}" rel="stylesheet">
-        <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />        
+        <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- <link type="text/css" href="http://code.jquery.com/ui/1.9.1/themes/redmond/jquery-ui.css" rel="stylesheet"> -->
         <!--[if lt IE 9]>
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
             <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
         <![endif]-->
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
         @yield('HeadInclude')
     </head>
     <body class="skin-yellow fixed">
@@ -77,14 +76,14 @@ if ($company != null) {
                                         <img src="{{ Gravatar::src(Auth::user()->email) }}" class="user-image" alt="User Image">
                                     @endif
                                     <span class="hidden-xs">{{Auth::user()->first_name." ".Auth::user()->last_name}}</span>
-                                @endif          
+                                @endif
                                 </a>
                                 <ul class="dropdown-menu">
                                     <!-- User image -->
                                     <li class="user-header"  style="background-color:#343F44;">
                                         @if(Auth::user()->profile_pic)
                                         <img src="{{asset('lb-faveo/dist/img')}}{{'/'}}{{Auth::user()->profile_pic}}" class="img-circle" alt="User Image" />
-                                        @else                                      
+                                        @else
                                             <img src="{{ Gravatar::src(Auth::user()->email) }}" class="img-circle" alt="User Image">
                                         @endif
                                         <p>
@@ -175,14 +174,14 @@ if ($company != null) {
                                         <li @yield('myticket')>
                                              <a href="{{url('ticket/myticket')}}">
                                                 <i class="fa fa-user"></i> <span>My Tickets</span>
-                                               
+
                                                 <small class="label pull-right bg-green">{{count($myticket) }}</small>
                                             </a>
                                         </li>
                                         <li>
                                             <a href="{{url('unassigned')}}">
                                                 <i class="fa fa-th"></i> <span>Unassigned</span>
-                                                
+
                                                 <small class="label pull-right bg-green">{{count($unassigned)}}</small>
                                             </a>
                                         </li>
@@ -316,7 +315,7 @@ $group = App\Model\helpdesk\Agent\Groups::where('name', '=', $agent_group)->wher
                         </footer>
                     </div><!-- ./wrapper -->
 
-                    <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+                    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
                     <!-- Bootstrap 3.3.2 JS -->
                     <script src="{{asset("lb-faveo/downloads/bootstrap.min.js")}}" type="text/javascript"></script>
                     <!-- Slimscroll -->
@@ -393,7 +392,7 @@ $(function() {
                     <script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
                     <script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
 
-        
+
                     <script>
                         $(function () {
                         //Add text editor

resources/views/themes/default1/layouts/blank.blade.php

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
 
         <title> SUPPORT CENTER | CLIENT PANEL</title>
-        
+
         <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
         <!-- Bootstrap 3.3.2 -->
         <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
@@ -13,21 +13,20 @@
         <!-- Ionicons -->
         <link href="http://code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css" rel="stylesheet" type="text/css" />
         <!-- fullCalendar 2.2.5-->
-        <link href="{{asset("plugins/fullcalendar/fullcalendar.min.css")}}" rel="stylesheet" type="text/css" />
-        <link href="{{asset("plugins/fullcalendar/fullcalendar.print.css")}}" rel="stylesheet" type="text/css" media='print' />
+        <link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.min.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.print.css")}}" rel="stylesheet" type="text/css" media='print' />
         <!-- Theme style -->
         <link href="{{asset("dist/css/AdminLTE.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- AdminLTE Skins. Choose a skin from the css/skins
              folder instead of downloading all of them to reduce the load. -->
         <link href="{{asset("dist/css/skins/_all-skins.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- iCheck -->
-        <link href="{{asset("plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <link rel="stylesheet" href="{{asset("dist/css/tabby.css")}}" type="text/css">
         <link href="http://www.jqueryscript.net/css/jquerysctipttop.css" rel="stylesheet" type="text/css">
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <link rel="stylesheet" href="{{asset("dist/css/editor.css")}}" type="text/css">
-        <link href="{{asset("plugins/filebrowser/plugin.js")}}" rel="stylesheet" type="text/css" />
 
         <script src="ckeditor/ckeditor.js"></script>
         <!--[if lt IE 9]>
@@ -105,7 +104,7 @@
 
                             <!-- Right side column. Contains the navbar and content of the page -->
                             <div class="content-wrapper">
-                                
+
                                 <section class="content-header">
                                     @yield('PageHeader')
                                     @yield('breadcrumbs')
@@ -126,20 +125,20 @@
                             </footer>
                     </div><!-- ./wrapper -->
 
-                    <!-- jQuery 2.1.3 -->
-                    <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+                    <!-- jQuery 2.1.1 -->
+                    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
                     <!-- Bootstrap 3.3.2 JS -->
                     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
                     <!-- Slimscroll -->
-                    <script src="{{asset("plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
+                    <script src="{{asset("lb-faveo/plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
                     <!-- FastClick -->
-                    <script src='{{asset("plugins/fastclick/fastclick.min.js")}}'></script>
+                    <script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}"></script>
                     <!-- AdminLTE App -->
                     <script src="{{asset("dist/js/app.min.js")}}" type="text/javascript"></script>
                     <!-- AdminLTE for demo purposes -->
                     {{-- // <script src="{{asset("dist/js/demo.js")}}" type="text/javascript"></script> --}}
                     <!-- iCheck -->
-                    <script src="{{asset("plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
+                    <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
                     <!-- Page Script -->
                     <script>
 $(function() {
@@ -197,7 +196,7 @@ $(function() {
                     <!-- CK Editor -->
                     <script src="{{asset("//cdn.ckeditor.com/4.4.3/standard/ckeditor.js")}}"></script>
                     <script src="{{asset("//cdn.ckeditor.com/4.4.3/full/ckeditor.js")}}"></script>
-                    <script src="{{asset("plugins/filebrowser/plugin.js")}}"></script>
+                    <script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
 
                     @yield('FooterInclude')
                     </body>

resources/views/themes/default1/layouts/client.blade.php

@@ -29,7 +29,7 @@
             <header id="masthead" class="site-header" role="banner">
                 <div class="container">
                 <div id="logo" class="site-logo text-center" style="font-size: 30px;">
-                <?php 
+                <?php
                 $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first();
 				$system = App\Model\helpdesk\Settings\System::where('id', '=', '1')->first();
 				?>
@@ -82,7 +82,7 @@
 							<li><a href="#" class="collapsed" data-toggle="collapse" data-target="#login-form">Login <i class="sub-indicator fa fa-chevron-circle-down fa-fw text-muted"></i></a></li>
 						</ul><!-- .navbar-login -->
 						<div id="login-form" class="login-form collapse fade clearfix">
-            {!!  Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!}  
+            {!!  Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!}
 
 			<div class="form-group has-feedback {{ $errors->has('email') ? 'has-error' : '' }}">
 				{!! Form::text('email',null,['placeholder'=>'Email','class' => 'form-control']) !!}
@@ -133,7 +133,7 @@
 			<li>{!! $errors->first('password', '<spam class="help-block ">:message</spam>') !!}</li>
 	    </div>
 	@endif
-    
+
                             </div>
                 </div>
                             </header>
@@ -144,7 +144,7 @@
         <div id="main" class="site-main clearfix">
 			<div class="container">
 				<div class="content-area">
-					<div class="row">			
+					<div class="row">
                                    @yield('content')
                         <div id="sidebar" class="site-sidebar col-md-3">
 							<div class="widget-area">
@@ -159,10 +159,10 @@
                     </div>
                 </div>
        		</div>
-		</div>			
+		</div>
 <!-- /.content-wrapper -->
-<?php 
-$footer = App\Model\helpdesk\Theme\Footer::whereId('1')->first();                            
+<?php
+$footer = App\Model\helpdesk\Theme\Footer::whereId('1')->first();
 $footer2 = App\Model\helpdesk\Theme\Footer2::whereId('1')->first();
 $footer3 = App\Model\helpdesk\Theme\Footer3::whereId('1')->first();
 $footer4 = App\Model\helpdesk\Theme\Footer4::whereId('1')->first();
@@ -190,7 +190,7 @@ $footer4 = App\Model\helpdesk\Theme\Footer4::whereId('1')->first();
 							<section id="section-latest-news" class="section">
 								<h2 class="section-title h4 clearfix">{!!$footer2->title!!}</h2>
 								<div class="textwidget">
-									<p>{!!$footer2->footer!!}</p>	
+									<p>{!!$footer2->footer!!}</p>
 								</div>
 							</section><!-- #section-latest-news -->
 						</div>
@@ -231,8 +231,8 @@ $footer4 = App\Model\helpdesk\Theme\Footer4::whereId('1')->first();
                         </div>
 					</div>
 		</footer><!-- #colophon -->
-                    <!-- jQuery 2.1.3 -->
-                    <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+                    <!-- jQuery 2.1.1 -->
+                    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
                     <!-- Bootstrap 3.3.2 JS -->
                     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
                     <!-- Slimscroll -->

resources/views/themes/default1/layouts/kb.blade.php

@@ -11,29 +11,28 @@
         <!-- Ionicons -->
         <link href="{{asset("downloads/ionicons.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- fullCalendar 2.2.5-->
-        <link href="{{asset("plugins/fullcalendar/fullcalendar.min.css")}}" rel="stylesheet" type="text/css" />
-        <link href="{{asset("plugins/fullcalendar/fullcalendar.print.css")}}" rel="stylesheet" type="text/css" media='print' />
+        <link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.min.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.print.css")}}" rel="stylesheet" type="text/css" media='print' />
         <!-- Theme style -->
         <link href="{{asset("dist/css/AdminLTE.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
         <link href="{{asset("dist/css/skins/_all-skins.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- iCheck -->
-        <link href="{{asset("plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
+        <link href="{{asset("lb-faveo/plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <link rel="stylesheet" href="{{asset("dist/css/tabby.css")}}" type="text/css">
         <link href="{{asset("downloads/jquerysctipttop.css")}}" rel="stylesheet" type="text/css">
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <link rel="stylesheet" href="{{asset("dist/css/editor.css")}}" type="text/css">
-        <link href="{{asset("plugins/filebrowser/plugin.js")}}" rel="stylesheet" type="text/css" />
         {{-- jquery ui css --}}
         <link type="text/css" href="{{asset("downloads/jquery.ui.css")}}" rel="stylesheet">
-        <link href="{{asset("plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />        
+        <link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
         <!-- <link type="text/css" href="http://code.jquery.com/ui/1.9.1/themes/redmond/jquery-ui.css" rel="stylesheet"> -->
         <!--[if lt IE 9]>
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
             <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
         <![endif]-->
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
         @yield('HeadInclude')
     </head>
     <body class="skin-black fixed">
@@ -65,14 +64,14 @@ if ($company != null) {
                                         <img src="{{asset('dist/img')}}{{'/'}}{{Auth::user()->profile_pic}}"class="user-image" alt="User Image"/>
                                     @endif
                                     <span class="hidden-xs">{{Auth::user()->first_name}}</span>
-                                @endif          
+                                @endif
                                 </a>
                                 <ul class="dropdown-menu">
                                     <!-- User image -->
                                     <li class="user-header"  style="background-color:#343F44;">
                                         @if(Auth::user()->profile_pic)
                                         <img src="{{asset('dist/img')}}{{'/'}}{{Auth::user()->profile_pic}}" class="img-circle" alt="User Image" />
-                                        @else                                      
+                                        @else
                                             <img src="{{ Gravatar::src(Auth::user()->email) }}" class="img-circle" alt="User Image">
                                         @endif
                                         <p>
@@ -165,7 +164,7 @@ if ($company != null) {
                                                 <small class="label pull-right bg-green"></small>
                                             </a>
                                         </li>
-                                        
+
                             </ul>
                         </section>
                         <!-- /.sidebar -->
@@ -190,19 +189,19 @@ if ($company != null) {
             <strong>Copyright &copy; {!! date('Y') !!}  <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>.</strong> All rights reserved. Powered by <a href="http://www.faveohelpdesk.com/">Faveo</a>
                         </footer>
                     </div><!-- ./wrapper -->
-                    <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+                    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
                     <!-- Bootstrap 3.3.2 JS -->
                     <script src="{{asset("downloads/bootstrap.min.js")}}" type="text/javascript"></script>
                     <!-- Slimscroll -->
-                    <script src="{{asset("plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
+                    <script src="{{asset("lb-faveo/plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
                     <!-- FastClick -->
-                    <script src="{{asset("plugins/fastclick/fastclick.min.js")}}"></script>
+                    <script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}"></script>
                     <!-- AdminLTE App -->
                     <script src="{{asset("dist/js/app.min.js")}}" type="text/javascript"></script>
                     <!-- AdminLTE for demo purposes -->
                     <script src="{{asset("dist/js/demo.js")}}" type="text/javascript"></script>
                     <!-- iCheck -->
-                    <script src="{{asset("plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
+                    <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
                     <!-- maskinput -->
                     <script src="js/jquery.maskedinput.min.js" type="text/javascript"></script>
                      <!-- jquery ui  -->
@@ -258,8 +257,8 @@ $(function() {
                     <!-- CK Editor -->
                     <!-- // <script src="{{asset("//cdn.ckeditor.com/4.4.3/standard/ckeditor.js")}}"></script> -->
                     <script src="{{asset("downloads/CKEditor.js")}}"></script>
-                    <script src="{{asset("plugins/filebrowser/plugin.js")}}"></script>
-                    <script src="{{asset("plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>        
+                    <script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
+                    <script src="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js")}}" type="text/javascript"></script>
                     <script>
                         $(function () {
                         //Add text editor

resources/views/themes/default1/layouts/login.blade.php

@@ -4,14 +4,16 @@
     <meta charset="UTF-8">
     <title>SUPPORT CENTER</title>
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
+    
     <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
+    
+    <link href="{{asset("lb-faveo/css/bootstrap.min.css")}}" rel="stylesheet" type="text/css" />
+    
+    <link href="{{asset("lb-faveo/css/font-awesome.min.css")}}" rel="stylesheet" type="text/css" />
     <!-- Theme style -->
     <link href="{{asset("lb-faveo/css/AdminLTE.min.css")}}" rel="stylesheet" type="text/css" />
     <!-- iCheck -->
     <link href="{{asset("lb-faveo/plugins/iCheck/square/blue.css")}}" rel="stylesheet" type="text/css" />
-
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -22,7 +24,7 @@
   <body class="login-page">
     <div class="login-box">
       <div class="login-logo">
-        <?php 
+        <?php
                 $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first();
         $system = App\Model\helpdesk\Settings\System::where('id', '=', '1')->first();
         ?>
@@ -32,7 +34,7 @@
           <a href="{{url('/')}}" rel="home">
         @endif
                 @if($company->use_logo == 1)
-                  <img src="{{asset('lb-faveo/media/company')}}{{'/'}}{{$company->logo}}" alt="User Image" width="200px" />
+                  <img src="{{asset('uploads/company')}}{{'/'}}{{$company->logo}}" alt="User Image" width="200px" />
                 @else
                   @if($system->name)
                     {!! $system->name !!}
@@ -51,18 +53,21 @@
     </div>
     </div>
 
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}" type="text/javascript"></script>
+
+    <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
     <!-- iCheck -->
     <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
+
     <script>
-      $(function () {
-        $('input').iCheck({
-          checkboxClass: 'icheckbox_square-blue',
-          radioClass: 'iradio_square-blue',
-          increaseArea: '20%' // optional
+        $(function () {
+            $('input').iCheck({
+                checkboxClass: 'icheckbox_square-blue',
+                radioClass: 'iradio_square-blue',
+                increaseArea: '20%' // optional
+            });
         });
-      });
     </script>
+
   </body>
 </html>

resources/views/themes/default1/layouts/register.blade.php

@@ -23,12 +23,12 @@
       <div class="login-logo">
         <a href="../../index2.html"><b>Faveo</b> HELP DESK</a>
       </div><!-- /.login-logo -->
-      
+
        @yield('body')
-       
+
     </div><!-- /.login-box -->
 
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
     <!-- iCheck -->
     <script src="{{asset("plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>

resources/views/themes/default1/update/notification.blade.php

@@ -1,11 +1,23 @@
+<li class="dropdown notifications-menu">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+        <i class="fa fa-refresh"></i>
+        <span class="label label-danger" id="count">{!! $notification->count() !!}</span>
+    </a>
+    <ul class="dropdown-menu" style="width:500px">
+        
+        <li class="header">You have {!! $notification->count() !!} update(s).</li>
 
-@if($data->count()>0)
-@foreach($data as $notify)
-@if($notify->value)
-<div class="alert alert-success alert-dismissable">
-    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-    {!! ucfirst($notify->value) !!}
-</div>
-@endif
-@endforeach
-@endif
+        <ul class="menu list-unstyled">
+            @if($notification->count()>0)
+            @foreach($notification as $notify)
+            @if($notify->value)
+
+            <li>&nbsp;&nbsp;&nbsp;{!! ucfirst($notify->value) !!}</li>
+            <li class="clearfix"></li>
+            @endif
+            @endforeach
+            @endif
+
+        </ul>
+    </ul>
+</li>

resources/views/themes/default1/update/update.blade.php

@@ -62,20 +62,24 @@
 
                                         </div>
                                         <div class="box-body"  style="background-color: black; height: 410px; overflow: scroll;" id="data">
-                                            <?php $updated = $controller->doUpdate(); ?>
+                                            <?php
+                                            $updated = $controller->doUpdate();
+                                            if ($updated === true) {
+                                                $controller->copyToActualDirectory($latest_version);
+                                            } elseif ($found != true) {
+                                                echo '<p>&raquo; No update is available.</p>';
+                                                exit();
+                                            }
+                                            ?>
                                         </div>
                                 </div>
                             </div>
                             <?php
                         }
-
-                        if ($updated == true) {
-                            $controller->copyToActualDirectory($latest_version);
-                        } elseif ($found != true) {
-                            echo '<p>&raquo; No update is available.</p>';
-                        }
-                    } else
+                    } else{
                         echo '<p>Could not find latest realeases.</p>';
+                    }
+                    
                     ?>
 
                 </div>
@@ -90,4 +94,6 @@
         }, 500);
     </script>
 
-    @stop
+    @stop
+    
+   

resources/views/vendor/laravel-filemanager/index.blade.php

@@ -16,7 +16,7 @@
     <div class="row fill">
         <div class="panel panel-primary fill">
             <div class="panel-heading">
-                <h3 class="panel-title">{{ Lang::get('laravel-filemanager::lfm.title-panel') }}</h3>
+                <h3 class="panel-title">Faveo File Manager</h3>
             </div>
             <div class="panel-body fill">
                 <div class="row fill">
@@ -39,13 +39,13 @@
                                     <div class="collapse navbar-collapse">
                                         <ul class="nav navbar-nav" id="nav-buttons">
                                             <li>
-                                                <a href="#!" id="upload" data-toggle="modal" data-target="#uploadModal"><i class="fa fa-upload"></i> {{ Lang::get('laravel-filemanager::lfm.nav-upload') }}</a>
+                                                <a href="#!" id="upload" data-toggle="modal" data-target="#uploadModal"><i class="fa fa-upload"></i> Upload</a>
                                             </li>
                                             <li>
-                                                <a href="#!" class="thumbnail-display" id="thumbnail-display"><i class="fa fa-picture-o"></i> {{ Lang::get('laravel-filemanager::lfm.nav-thumbnails') }}</a>
+                                                <a href="#!" class="thumbnail-display" id="thumbnail-display"><i class="fa fa-picture-o"></i> Thumbnails</a>
                                             </li>
                                             <li>
-                                                <a href="#!" class="list-display" id="list-display"><i class="fa fa-list"></i> {{ Lang::get('laravel-filemanager::lfm.nav-list') }}</a>
+                                                <a href="#!" class="list-display" id="list-display"><i class="fa fa-list"></i> List</a>
                                             </li>
                                         </ul>
                                     </div>