update 1.0.8.0

Commits for version update

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

@@ -60,6 +60,9 @@ class="active"
             @if($errors->first('phone_number'))
             <li class="error-message-padding">{!! $errors->first('phone_number', ':message') !!}</li>
             @endif
+            @if($errors->first('country_code'))
+            <li class="error-message-padding">{!! $errors->first('country_code', ':message') !!}</li>
+            @endif
             @if($errors->first('mobile'))
             <li class="error-message-padding">{!! $errors->first('mobile', ':message') !!}</li>
             @endif
@@ -120,9 +123,9 @@ class="active"
                 {!! Form::text('ext',null,['class' => 'form-control']) !!}
             </div>
             <!--country code-->
-            <div class="col-xs-1 form-group {{ Session::has('country_code') ? 'has-error' : '' }}">
+            <div class="col-xs-1 form-group {{  $errors->has('country_code') ? 'has-error' : '' }}">
 
-                {!! Form::label('country_code',Lang::get('lang.country-code')) !!}
+                {!! Form::label('country_code',Lang::get('lang.country-code')) !!} @if($send_otp->status ==1)<span class="text-red"> *</span>@endif
                 {!! Form::text('country_code',null,['class' => 'form-control', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code')]) !!}
 
             </div>
@@ -133,7 +136,7 @@ class="active"
             </div>
             <!-- Mobile -->
             <div class="col-xs-3 form-group {{ $errors->has('mobile') ? 'has-error' : '' }}">
-                {!! Form::label('mobile',Lang::get('lang.mobile_number')) !!}
+                {!! Form::label('mobile',Lang::get('lang.mobile_number')) !!}@if($send_otp->status ==1)<span class="text-red"> *</span>@endif
                 {!! Form::text('mobile',null,['class' => 'form-control']) !!}
             </div>
         </div>

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

@@ -17,7 +17,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{Lang::get('lang.staffs')}}</h1>
+<h1>{{Lang::get('lang.departments')}}</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -88,7 +88,7 @@ class="active"
             <!-- manager -->
             <div class="col-xs-6 form-group {{ $errors->has('manager') ? 'has-error' : '' }}">
                 {!! Form::label('manager',Lang::get('lang.manager')) !!}
-                {!!Form::select('manager',[''=>Lang::get('lang.select_a_manager'),Lang::get('lang.manager')=>$user->lists('user_name','id')->toArray()],null,['class' => 'form-control select']) !!}
+                {!!Form::select('manager',[''=>Lang::get('lang.select_a_manager'),Lang::get('lang.manager')=>$user->lists('full_name','id')->toArray()],null,['class' => 'form-control select']) !!}
             </div>
         </div>
     </div>

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

@@ -16,7 +16,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{Lang::get('lang.staffs')}}</h1>
+<h1>{{Lang::get('lang.departments')}}</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -88,7 +88,7 @@ class="active"
             <!-- manager -->
             <div class="col-xs-6 form-group {{ $errors->has('manager') ? 'has-error' : '' }}">
                 {!! Form::label('manager',Lang::get('lang.manager')) !!}
-                {!!Form::select('manager',[null=>Lang::get('lang.select_a_manager'),Lang::get('lang.manager')=>$user->lists('user_name','id')->toArray()],null,['class' => 'form-control select']) !!}
+                {!!Form::select('manager',[null=>Lang::get('lang.select_a_manager'),Lang::get('lang.manager')=>$user->lists('full_name','id')->toArray()],null,['class' => 'form-control select']) !!}
             </div>
         </div>
     </div>

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

@@ -16,7 +16,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{Lang::get('lang.staffs')}}</h1>
+<h1>{{Lang::get('lang.departments')}}</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -88,7 +88,7 @@ class="active"
                     $manager = "";
                 } else {
                     $manager = App\User::whereId($department->manager)->first();
-                    $manager = $manager->user_name;
+                    $manager = $manager->full_name;
                 }
 
                 if ($department->sla == null) {

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

@@ -16,7 +16,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{Lang::get('lang.staffs')}}</h1>
+<h1>{{Lang::get('lang.teams')}}</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -61,8 +61,7 @@ class="active"
             <!-- team lead -->
             <div class="col-xs-6 form-group {{ $errors->has('team_lead') ? 'has-error' : '' }}">
                 {!! Form::label('team_lead',Lang::get('lang.team_lead')) !!} 
-                <?php $user = App\User::where('role', 'admin')->orWhere('role', 'agent')->get(); ?>
-                {!! Form::select('team_lead',[''=>Lang::get('lang.select_a_team_lead'), Lang::get('lang.members')=>$user->lists('user_name','id')->toArray()],null,['class' => 'form-control']) !!}	
+                {!! Form::select('team_lead',[''=>Lang::get('lang.select_a_team_lead'), Lang::get('lang.members')=>$user->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}	
             </div>
         </div>
         <!-- status -->

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

@@ -16,7 +16,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{Lang::get('lang.staffs')}}</h1>
+<h1>{{Lang::get('lang.teams')}}</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -60,8 +60,7 @@ class="active"
             <!-- team lead -->
             <div class="col-xs-6 form-group {{ $errors->has('team_lead') ? 'has-error' : '' }}">
                 {!! Form::label('team_lead',Lang::get('lang.team_lead')) !!}
-                <?php $user = App\User::where('role', 'admin')->orWhere('role', 'agent')->get(); ?>
-                {!! Form::select('team_lead',[''=>Lang::get('lang.select_a_team_lead'), Lang::get('lang.members')=>$user->lists('user_name','id')->toArray()],null,['class' => 'form-control']) !!}	
+                {!! Form::select('team_lead',[''=>Lang::get('lang.select_a_team_lead'), Lang::get('lang.members')=>$user->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!}	
             </div>
         </div>
         <!-- status -->

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

@@ -16,7 +16,7 @@ class="active"
 @stop
 <!-- header -->
 @section('PageHeader')
-<h1>{{Lang::get('lang.staffs')}}</h1>
+<h1>{{Lang::get('lang.teams')}}</h1>
 @stop
 <!-- /header -->
 <!-- breadcrumbs -->
@@ -60,7 +60,7 @@ class="active"
                     </tr>
                     @foreach($teams as $team)
                     <tr>
-                        <td><a href="{{route('teams.edit', $team->id)}}"> {{$team->name }}</a></td>
+                        <td><a href="{{route('teams.show', $team->id)}}"> {{$team->name }}</a></td>
                         <td>
                             @if($team->status=='1')
                             <span style="color:green">{{Lang::get('lang.active')}}</span>
@@ -72,15 +72,26 @@ class="active"
                                 $team_lead = "";
                             } else {
                                 $users = App\User::whereId($team->team_lead)->first();
-                                $team_lead = $users->first_name . " " . $users->last_name;
+                                $team_lead = $users->full_name;
                             }
                             ?>
                         <td>{{count($assign_team_agent->where('team_id',$team->id))}}</td>
                         <td>{{ $team_lead }}</td>
                         <td>
                             {!! Form::open(['route'=>['teams.destroy', $team->id],'method'=>'DELETE']) !!}
+
                             <!-- To pop up a confirm Message -->
+                           @if ($team->status == 0) 
+                            <a href="{{route('teams.show', $team->id)}}" class="btn btn-success btn-xs btn-flat" disabled='disabled'><i class="fa fa-edit" style="color:black;"> </i> {!! Lang::get('lang.show') !!}</a>
+                            
+                            @endif
+                             @if ($team->status == 1) 
+                            <a href="{{route('teams.show', $team->id)}}" class="btn btn-success btn-xs btn-flat" ><i class="fa fa-edit" style="color:black;"> </i> {!! Lang::get('lang.show') !!}</a>
+                            
+                            @endif
+
                             <a href="{{route('teams.edit', $team->id)}}" class="btn btn-info btn-xs btn-flat"><i class="fa fa-edit" style="color:black;"> </i> {!! Lang::get('lang.edit') !!}</a>
+                            
                             {!! 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',

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

@@ -0,0 +1,94 @@
+@extends('themes.default1.admin.layout.admin')
+
+@section('Staffs')
+active
+@stop
+
+@section('staffs-bar')
+active
+@stop
+
+@section('teams')
+class="active"
+@stop
+
+@section('HeadInclude')
+@stop
+<!-- header -->
+@section('PageHeader')
+<h1>{{$teams->name}}</h1>
+@stop
+<!-- /header -->
+<!-- breadcrumbs -->
+@section('breadcrumbs')
+<ol class="breadcrumb">
+</ol>
+@stop
+<!-- /breadcrumbs -->
+<!-- content -->
+@section('content')
+
+
+@if(Session::has('success'))
+    <div 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>Fail!</b>
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+        {!! Session::get('fails') !!}
+    </div>
+    @endif
+<!-- <input type="text" name="show_id" value="{{$id}}"> -->
+<?php
+ if($team_lead_name= App\User::whereId($teams->team_lead)->first())
+          {
+            $team_lead = $team_lead_name->first_name . " " . $team_lead_name->last_name;
+             // $assign_team_agent=App\Model\helpdesk\Agent\Assign_team_agent::all();
+            // $total_members = $assign_team_agent->where('team_id',$id)->count();
+        }
+
+?>
+            
+    <div class="box box-primary">
+        <div class="box-header with-border">
+        @if($team_lead_name)
+            <span class="lead border-right">{!! Lang::get('lang.team_lead') !!} : {!! $team_lead !!} </span>
+         @endif
+            <span class="lead border-left">{!! Lang::get('lang.status') !!} : <?php if($teams->status == 1) { $stat = Lang::get('lang.active'); } elseif($teams->status == 0) { $stat = Lang::get('lang.inactive'); } ?>{!! $stat !!} </span>
+            
+
+            <div class="pull-right">
+                <a href="{{URL::route('teams.index')}}" class="btn btn-primary"><i class="fa fa-arrow-left" aria-hidden="true"></i> {{Lang::get('lang.go_back')}}</a>
+            </div>
+        </div>
+        <input type="hidden" name="show_id" value={{$id}}>
+        <!-- /.box-header -->
+        <div class="box-body">             
+            {!! Datatable::table()
+                    ->addColumn(
+                        Lang::get('lang.user_name'),
+                        Lang::get('lang.name'),
+                        Lang::get('lang.status'),
+                        Lang::get('lang.group'),
+                        Lang::get('lang.depertment'),
+                        Lang::get('lang.role')
+                    )
+                    ->setUrl(route('teams.getshow.list', $id))  // this is the route where data will be retrieved
+                    ->render() 
+            !!}
+        </div>
+        <!-- /.box-body -->
+        <div class="box-footer">
+        </div>
+    </div>
+        
+
+@stop