update v1.0.5

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

@@ -127,40 +127,41 @@ class="active"
 			<h4>{{Lang::get('lang.account_status_setting')}}</h4>
 		</div>
 	<div class="row">
-	<div class="col-xs-6">
-	<!-- Role -->
-		<div class="form-group {{ $errors->has('role') ? 'has-error' : '' }}">
+		<div class="col-xs-6">
+		<!-- acccount type -->
+			<div class="form-group {{ $errors->has('active') ? 'has-error' : '' }}">
 
-			{!! Form::label('role',Lang::get('lang.role')) !!}
-			{!! $errors->first('role', '<spam class="help-block">:message</spam>') !!}
-			<div class="row">
-				<div class="col-xs-3">
-					{!! Form::radio('role','admin',true) !!}{{Lang::get('lang.admin')}}
-				</div>
-				<div class="col-xs-3">
-					{!! Form::radio('role','agent',null) !!}{{Lang::get('lang.agent')}}
+				{!! Form::label('active',Lang::get('lang.status')) !!}
+				{!! $errors->first('active', '<spam class="help-block">:message</spam>') !!}
+				<div class="row">
+					<div class="col-xs-3">
+						{!! Form::radio('active','1',true) !!}{{Lang::get('lang.active')}}
+					</div>
+					<div class="col-xs-3">
+						{!! Form::radio('active','0',null) !!}{{Lang::get('lang.inactive')}}
+					</div>
 				</div>
+
 			</div>
-		</div>
-	<!-- account type -->
-		<div class="form-group {{ $errors->has('account_type') ? 'has-error' : '' }}">
 
-			{!! Form::label('account_type',Lang::get('lang.account_type')) !!}
-			{!! $errors->first('account_type', '<spam class="help-block">:message</spam>') !!}
-			<div class="row">
-				<div class="col-xs-3">
-					{!! Form::radio('account_type','1',true) !!}{{Lang::get('lang.active')}}
-				</div>
-				<div class="col-xs-3">
-					{!! Form::radio('account_type','0',null) !!}{{Lang::get('lang.locked')}}
+		<!-- Role -->
+			<div class="form-group {{ $errors->has('role') ? 'has-error' : '' }}">
+
+				{!! Form::label('role',Lang::get('lang.role')) !!}
+				{!! $errors->first('role', '<spam class="help-block">:message</spam>') !!}
+				<div class="row">
+					<div class="col-xs-3">
+						{!! Form::radio('role','admin',true) !!}{{Lang::get('lang.admin')}}
+					</div>
+					<div class="col-xs-3">
+						{!! Form::radio('role','agent',null) !!}{{Lang::get('lang.agent')}}
+					</div>
 				</div>
 			</div>
 
 		</div>
-		</div>
 
 		<div class="col-xs-6">
-		
 		</div>
 	</div>
 
@@ -170,7 +171,7 @@ class="active"
 
 			{!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!}
 			{!! $errors->first('assign_group', '<spam class="help-block">:message</spam>') !!}
-			{!!Form::select('assign_group',[''=>'Select a Group','Groups'=>$groups->lists('name','name')],null,['class' => 'form-control select']) !!}
+			{!!Form::select('assign_group',[''=>'Select a Group','Groups'=>$groups->lists('name','id')],null,['class' => 'form-control select']) !!}
 
 		</div>
 
@@ -179,7 +180,7 @@ class="active"
 
 			{!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!}
 			{!! $errors->first('primary_dpt', '<spam class="help-block">:message</spam>') !!}
-			{!! Form::select('primary_dpt', [''=>'Select a Department','Departments'=>$departments->lists('name','name')],null,['class' => 'form-control select']) !!}
+			{!! Form::select('primary_dpt', [''=>'Select a Department','Departments'=>$departments->lists('name','id')],null,['class' => 'form-control select']) !!}
 
 		</div>
 
@@ -188,7 +189,7 @@ class="active"
 
 			{!! Form::label('agent_tzone',Lang::get('lang.agent_time_zone')) !!}
 			{!! $errors->first('agent_tzone', '<spam class="help-block">:message</spam>') !!}
-			{!! Form::select('agent_tzone', [''=>'Select a Time Zone', 'Time Zones'=>$timezones->lists('name','name')],null,['class' => 'form-control select']) !!}
+			{!! Form::select('agent_tzone', [''=>'Select a Time Zone', 'Time Zones'=>$timezones->lists('name','id')],null,['class' => 'form-control select']) !!}
 
 		</div>
 	</div>

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

@@ -132,6 +132,21 @@ class="active"
 		</div>
 	<div class="row">
 	<div class="col-xs-6">
+	<!-- acccount type -->
+		<div class="form-group {{ $errors->has('active') ? 'has-error' : '' }}">
+
+			{!! Form::label('active',Lang::get('lang.status')) !!}
+			{!! $errors->first('active', '<spam class="help-block">:message</spam>') !!}
+			<div class="row">
+				<div class="col-xs-3">
+					{!! Form::radio('active','1',true) !!}{{Lang::get('lang.active')}}
+				</div>
+				<div class="col-xs-3">
+					{!! Form::radio('active','0',null) !!}{{Lang::get('lang.inactive')}}
+				</div>
+			</div>
+
+		</div>
 	<!-- role -->
 		<div class="form-group {{ $errors->has('role') ? 'has-error' : '' }}">
 
@@ -146,21 +161,7 @@ class="active"
 				</div>
 			</div>
 		</div>
-	<!-- acccount type -->
-		<div class="form-group {{ $errors->has('account_type') ? 'has-error' : '' }}">
-
-			{!! Form::label('account_type',Lang::get('lang.account_type')) !!}
-			{!! $errors->first('account_type', '<spam class="help-block">:message</spam>') !!}
-			<div class="row">
-				<div class="col-xs-3">
-					{!! Form::radio('account_type','1',true) !!}{{Lang::get('lang.active')}}
-				</div>
-				<div class="col-xs-3">
-					{!! Form::radio('account_type','0',null) !!}{{Lang::get('lang.locked')}}
-				</div>
-			</div>
-
-		</div>
+	
 		</div>
 	<!-- day light saving -->
 		{{-- <div class="col-xs-6"> --}}
@@ -210,21 +211,21 @@ class="active"
 		<div class="col-xs-4 form-group {{ $errors->has('assign_group') ? 'has-error' : '' }}">
 			{!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!}
 			{!! $errors->first('assign_group', '<spam class="help-block">:message</spam>') !!}
-			{!!Form::select('assign_group', [''=>'Select a Group','Groups'=>$groups->lists('name','name')],null,['class' => 'form-control select']) !!}
+			{!!Form::select('assign_group', [''=>'Select a Group','Groups'=>$groups->lists('name','id')],null,['class' => 'form-control select']) !!}
 		</div>
 
 	<!-- primary department -->
 		<div class="col-xs-4 form-group {{ $errors->has('primary_dpt') ? 'has-error' : '' }}">
 			{!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!}
 			{!! $errors->first('primary_dpt', '<spam class="help-block">:message</spam>') !!}
-			{!!Form::select('primary_dpt', $departments->lists('name','name'),null,['class' => 'form-control select']) !!}
+			{!!Form::select('primary_dpt', $departments->lists('name','id'),null,['class' => 'form-control select']) !!}
 		</div>
 
 	<!-- agent timezone -->
 		<div class="col-xs-4 form-group {{ $errors->has('agent_tzone') ? 'has-error' : '' }}">
 			{!! Form::label('agent_tzone',Lang::get('lang.agent_time_zone')) !!}
 			{!! $errors->first('agent_tzone', '<spam class="help-block">:message</spam>') !!}
-			{!!Form::select('agent_tzone', $timezones->lists('name','name'),null,['class' => 'form-control select']) !!}
+			{!!Form::select('agent_tzone', $timezones->lists('name','id'),null,['class' => 'form-control select']) !!}
 		</div>
 	</div>
 

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

@@ -35,7 +35,7 @@ class="active"
 <div class="box-header">
 	<h2 class="box-title">{!! Lang::get('lang.staffs') !!} </h2><a href="{{route('agents.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_agent')}}</a></div>
 
-<div class="box-body table-responsive no-padding">
+<div class="box-body table-responsive">
 <?php 
  $user = App\User::where('role','!=','user')->orderBy('id', 'ASC')->paginate(20);
 ?>
@@ -59,7 +59,7 @@ class="active"
     </div>
     @endif
     		<!-- Agent table -->
-				<table class="table table-hover" style="overflow:hidden;">
+				<table class="table table-bordered dataTable" style="overflow:hidden;">
 					<tr>
 							<th width="100px">{{Lang::get('lang.name')}}</th>
 							<th width="100px">{{Lang::get('lang.user_name')}}</th>
@@ -86,24 +86,26 @@ class="active"
 							}
 							?>
 							<td>
-								@if($use->account_type=='1')
+								@if($use->active=='1')
 								<span style="color:green">{{'Active'}}</span>
 								@else
 								<span style="color:red">{{'Inactive'}}</span>
 								@endif
-							<td>{{$use->assign_group }}</td>
-							<td>{{$use->primary_dpt }}</td>
+
+								<?php    
+								$group = App\Model\helpdesk\Agent\Groups::whereId($use->assign_group)->first();
+								$department = App\Model\helpdesk\Agent\Department::whereId($use->primary_dpt)->first();
+								?>
+
+							<td>{{ $group->name }}</td>
+							<td>{{ $department->name }}</td>
 							<td>{{ UTC::usertimezone($use->created_at) }}</td>
 							{{-- <td>{{$use->Lastlogin_at}}</td> --}}
 							<td>
 							{!! Form::open(['route'=>['agents.destroy', $use->id],'method'=>'DELETE']) !!}
 							<a href="{{route('agents.edit', $use->id)}}" class="btn btn-info btn-xs btn-flat"><i class="fa fa-edit" style="color:black;"> </i> {!! Lang::get('lang.edit') !!} </a>
 								<!-- To pop up a confirm Message -->
-									{!! Form::button(' <i class="fa fa-trash" style="color:black;"> </i> '  . Lang::get('lang.delete') ,
-					            		['type' => 'submit',
-					            		'class'=> 'btn btn-warning btn-xs btn-flat',
-					            		'onclick'=>'return confirm("Are you sure?")'])
-					            	!!}
+									{{-- {!! Form::button(' <i class="fa fa-trash" style="color:black;"> </i> '  . Lang::get('lang.delete') ,['type' => 'submit', 'class'=> 'btn btn-warning btn-xs btn-flat','onclick'=>'return confirm("Are you sure?")']) !!} --}}
 							{!! Form::close() !!}
 							</td>
 						</tr>
@@ -111,9 +113,7 @@ class="active"
 						@endforeach
 				</table>
 		</div>
-		<div class="box-footer"></div>
+		
 </div>
-@section('FooterInclude')
-@stop
 @stop
 <!-- /content --> 

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

@@ -76,7 +76,7 @@ class="active"
 
 				{!! Form::label('sla',Lang::get('lang.SLA_plan')) !!}
 				{!! $errors->first('sla', '<spam class="help-block">:message</spam>') !!}
-				{!!Form::select('sla', ['SLA Plans'=>$slas->lists('grace_period','grace_period')],null,['class' => 'form-control select']) !!}
+				{!!Form::select('sla', ['SLA Plans'=>$slas->lists('grace_period','id')],null,['class' => 'form-control select']) !!}
 
 			</div>
 		<!-- manager -->
@@ -84,7 +84,7 @@ class="active"
 
 				{!! Form::label('manager',Lang::get('lang.manager')) !!}
 				{!! $errors->first('manager', '<spam class="help-block">:message</spam>') !!}
-				{!!Form::select('manager',[''=>'Select a Manager','Managers'=>$user->lists('user_name','user_name')],null,['class' => 'form-control select']) !!}
+				{!!Form::select('manager',[''=>'Select a Manager','Managers'=>$user->lists('user_name','id')],null,['class' => 'form-control select']) !!}
 
 			</div>
 

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

@@ -68,14 +68,13 @@ class="active"
 
 		</div>
 	</div>
-
 		<div class="row">
 		<!-- sla -->
 			<div class="col-xs-6 form-group {{ $errors->has('sla') ? 'has-error' : '' }}">
 
 				{!! Form::label('sla',Lang::get('lang.SLA_plan')) !!}
 				{!! $errors->first('sla', '<spam class="help-block">:message</spam>') !!}
-				{!!Form::select('sla', ['SLA Plans'=>$slas->lists('grace_period','grace_period')],null,['class' => 'form-control select']) !!}
+				{!!Form::select('sla', ['SLA Plans'=>$slas->lists('grace_period','id')],null,['class' => 'form-control select']) !!}
 
 			</div>
 			<!-- manager -->
@@ -83,7 +82,7 @@ class="active"
 
 				{!! Form::label('manager',Lang::get('lang.manager')) !!}
 				{!! $errors->first('manager', '<spam class="help-block">:message</spam>') !!}
-				{!!Form::select('manager',[''=>'Select a Manager','Managers'=>$user->lists('user_name','user_name')],null,['class' => 'form-control select']) !!}
+				{!!Form::select('manager',[null=>'Select a Manager','Managers'=>$user->lists('user_name','id')],null,['class' => 'form-control select']) !!}
 
 			</div>
 

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

@@ -34,7 +34,7 @@ class="active"
 <div class="box-header">
 	<h2 class="box-title">{!! Lang::get('lang.departments') !!}</h2><a href="{{route('departments.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_department')}}</a></div>
 
-<div class="box-body table-responsive no-padding">
+<div class="box-body table-responsive ">
 
 
 <!-- check whether success or not -->
@@ -44,7 +44,7 @@ class="active"
         <i class="fa  fa-check-circle"></i>
         <b>{!! Lang::get('lang.success') !!}</b>
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-        {{Session::get('success')}}
+        {!! Session::get('success') !!}
     </div>
     @endif
     <!-- failure message -->
@@ -53,37 +53,78 @@ class="active"
         <i class="fa fa-ban"></i>
         <b>{!! Lang::get('lang.fails') !!}!</b>
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-        {{Session::get('fails')}}
+        {!! Session::get('fails') !!}
     </div>
     @endif
     <!-- table -->
-				<table class="table table-hover" style="overflow:hidden;">
+				<table class="table table-bordered dataTable" style="overflow:hidden;">
 	<tr>
 						<tr>
 							<th>{{Lang::get('lang.name')}}</th>
 							<th>{{Lang::get('lang.type')}}</th>
+							<th>{{Lang::get('lang.sla_plan')}}</th>
 							<th>{{Lang::get('lang.department_manager')}}</th>
 							<th>{{Lang::get('lang.action')}}</th>
 						</tr>
+
+<?php
+$default_department = App\Model\helpdesk\Settings\System::where('id','=','1')->first();
+$default_department = $default_department->department;
+?>
+
 						@foreach($departments as $department)
 						<tr>
-							<td><a href="{{route('departments.edit', $department->id)}}"> {{$department -> name }}</a></td>
+							<td><a href="{{route('departments.edit', $department->id)}}"> {{$department -> name }}
+							@if($default_department == $department->id)
+							( Default )
+							<?php  
+							$disable = 'disabled';
+							?>
+							@else
+							<?php  
+							$disable = '';
+							?>
+							@endif
+							</a></td>
 							<td>
 								@if($department->type=='1')
 								<span style="color:green">{{'Public'}}</span>
 								@else
 								<span style="color:red">{{'Private'}}</span>
 								@endif
-							<td>{{$department->manager}}</td>
+							</td>
+								<?php 
+								if($department->manager == 0) {
+									$manager ="";
+								} else {
+									$manager = App\User::whereId($department->manager)->first();
+									$manager = $manager->user_name;
+								}	
+
+								if($department->sla == null){
+									$sla = "";
+								} else {
+									$sla = App\Model\helpdesk\Manage\sla_plan::whereId($department->sla)->first();
+									$sla = $sla->grace_period;
+								}
+								
+								?>
+
+							<td>{{ $sla }}</td>
+							<td>{{ $manager }}</td>
 							<td>
 							{!! Form::open(['route'=>['departments.destroy', $department->id],'method'=>'DELETE']) !!}
 							<a href="{{route('departments.edit', $department->id)}}" class="btn btn-info btn-xs btn-flat"><i class="fa fa-edit" style="color:black;"> </i> Edit</a>
-								<!-- To pop up a confirm Message -->
+							{{-- @if($default_department == $department->id) --}}
+							{{-- @else --}}
+							<!-- To pop up a confirm Message -->
 									{!! Form::button('<i class="fa fa-trash" style="color:black;"> </i> Delete',
 					            		['type' => 'submit',
-					            		'class'=> 'btn btn-warning btn-xs btn-flat',
+					            		'class'=> 'btn btn-warning btn-xs btn-flat '.$disable,
 					            		'onclick'=>'return confirm("Are you sure?")'])
 					            	!!}
+							{{-- @endif --}}
+								
 									{!! Form::close() !!}
 							</td>
 						</tr>

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

@@ -35,7 +35,7 @@ class="active"
 <div class="box-header">
 	<h2 class="box-title">{!! Lang::get('lang.groups') !!}</h2><a href="{{route('groups.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_group')}}</a></div>
 
-<div class="box-body table-responsive no-padding">
+<div class="box-body table-responsive">
 
 <!-- check whether success or not -->
 
@@ -44,7 +44,7 @@ class="active"
         <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')}}
+        {!! Session::get('success') !!}
     </div>
     @endif
     <!-- failure message -->
@@ -53,11 +53,11 @@ class="active"
         <i class="fa fa-ban"></i>
         <b>Fail!</b>
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-        {{Session::get('fails')}}
+        {!! Session::get('fails') !!}
     </div>
     @endif
     	<!-- Table -->
-				<table class="table table-hover" style="overflow:hidden;">
+				<table class="table table-bordered dataTable" style="overflow:hidden;">
 
 						<tr>
 							<th>{{Lang::get('lang.group_name')}}</th>

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

@@ -34,7 +34,7 @@ class="active"
 <div class="box-header">
 	<h2 class="box-title">{{Lang::get('lang.teams')}}</h2><a href="{{route('teams.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_team')}}</a></div>
 
-<div class="box-body table-responsive no-padding">
+<div class="box-body table-responsive">
 
 <!-- check whether success or not -->
 
@@ -56,7 +56,7 @@ class="active"
     </div>
     @endif
 
-				<table class="table table-hover" style="overflow:hidden;">
+				<table class="table table-bordered dataTable" style="overflow:hidden;">
 	<tr>
 							<th>{{Lang::get('lang.name')}}</th>
 							<th>{{Lang::get('lang.status')}}</th>
@@ -74,9 +74,16 @@ class="active"
 								<span style="color:red">{{'Inactive'}}</span>
 								@endif
 
-
+<?php
+if($team->team_lead == 0) {
+	$team_lead = "";
+} else {
+	$users = App\User::whereId($team->team_lead)->first();
+	$team_lead = $users->first_name . " " . $users->last_name;
+}
+?>
 							<td>{{count($assign_team_agent->where('team_id',$team->id))}}</td>
-							<td>{{$team->team_lead}}</td>
+							<td>{{ $team_lead }}</td>
 							<td>
 							{!! Form::open(['route'=>['teams.destroy', $team->id],'method'=>'DELETE']) !!}
 							<!-- To pop up a confirm Message -->