cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update v1.0.5.2

Browse Source
This commit is contained in:
sujitprasad
2016-01-29 12:49:45 +05:30
parent b1d1ebbbef
commit 0bcbc04f92
28 changed files with 1981 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/errors/500.blade.php
View File

@@ -1,4 +1,4 @@
lang.<html>
<html>
<head>
<link href='//fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
<style>

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

@@ -83,7 +83,7 @@ class="active"
{!! Form::label('website',Lang::get('lang.website')) !!}
{!! $errors->first('website', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('website',$companys->website,['class' => 'form-control']) !!}
{!! Form::url('website',$companys->website,['class' => 'form-control']) !!}
</div>
</div>
@@ -101,11 +101,11 @@ class="active"
<div class="col-md-12">
<!-- comapny address -->
<div class="form-group {{ $errors->has('company_address') ? 'has-error' : '' }}">
<div class="form-group {{ $errors->has('address') ? 'has-error' : '' }}">
{!! Form::label('address',Lang::get('lang.address')) !!}
{!! $errors->first('company_address', '<spam class="help-block">:message</spam>') !!}
{!! Form::textarea('company_address',$companys->address,['class' => 'form-control','size' => '30x5']) !!}
{!! $errors->first('address', '<spam class="help-block">:message</spam>') !!}
{!! Form::textarea('address',$companys->address,['class' => 'form-control','size' => '30x5']) !!}
</div>
</div>
@@ -154,6 +154,14 @@ class="active"
{!! Form::checkbox('use_logo') !!} <label> Use Logo</label>
</div>
@endif
<?php $company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first(); ?>
@if($companys->logo != null)
<div class="col-md-2">
<img src="{{asset('lb-faveo/media/company')}}{{'/'}}{{$company->logo}}" alt="User Image" width="100px" style="border:1px solid #DCD1D1" />
</div>
@endif
</div>
</div>
</div>

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

@@ -16,7 +16,7 @@ class="active"
<?php
if(Auth::user()->role == 'agent')
{
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->orderBy('id', 'DESC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->orderBy('id', 'DESC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('dept_id','=',$dept->id)->where('status', '<', 4)->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->orderBy('id', 'DESC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->orderBy('id', 'ASC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$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('assigned_to', '=', 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('assigned_to', '=', 0)->orderBy('id', 'DESC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->orderBy('id', 'DESC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 5)->orderBy('id', 'DESC')->paginate(20);

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

@@ -15,7 +15,7 @@ class="active"
@section('content')
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('dept_id','=',$dept->id)->where('status','1')->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', null)->where('status','1')->orderBy('id', 'DESC')->paginate(20);

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

@@ -65,6 +65,7 @@ class="active"
Lang::get('lang.email'),
Lang::get('lang.phone'),
Lang::get('lang.status'),
Lang::get('lang.ban'),
Lang::get('lang.last_login'),
Lang::get('lang.action')) // these are the column headings to be shown
->setUrl(route('user.list')) // this is the route where data will be retrieved

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

@@ -68,7 +68,7 @@ class="active"
<tr><th class="col-md-8"><h4><b>{!! Lang::get('lang.department') !!}:</b></h4></th><td class="col-md-6"><h4>{{ $dept }}</h4></td></tr>
<tr><th class="col-md-8"><h4><b>{!! Lang::get('lang.group') !!}:</b></h4></th><td class="col-md-6"><h4>{{ $grp }}</h4></td></tr>
<tr><th class="col-md-8"><h4><b>{!! Lang::get('lang.company') !!}:</b></h4></th><td class="col-md-6"> <h4>{{ $user->company }}</h4></td></tr>
<tr><th class="col-md-8"><h4><b>{!! Lang::get('lang.time_zone') !!}:</b></h4></th><td class="col-md-6"><h4> {{ $timezone }}</h4></td></tr>
{{-- <tr><th class="col-md-8"><h4><b>{!! Lang::get('lang.time_zone') !!}:</b></h4></th><td class="col-md-6"><h4> {{ $timezone }}</h4></td></tr> --}}
<tr><th class="col-md-8"><h4><b>{!! Lang::get('lang.role') !!}:</b></h4></th><td class="col-md-6"> <h4>{{ $user->role }}</h4></td></tr>
</table>
</div>

2
resources/views/themes/default1/agent/layout/agent.blade.php
View File

@@ -211,7 +211,7 @@ if (Auth::user()->role == 'admin') { ?>
<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->name) { ?>
<?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>