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

Merge remote-tracking branch 'refs/remotes/ladybirdweb/master'

Browse Source
This commit is contained in:
Manish Verma
2016-10-26 10:20:41 +05:30
parent b611fcdcf8 60a46e6ff4
commit 499a31abb4
14 changed files with 1711 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -356,8 +356,8 @@ class SettingsController extends Controller
$workflow = $workflow->whereId('1')->first(); $workflow = $workflow->whereId('1')->first();
$cron_path = base_path('artisan'); $cron_path = base_path('artisan');
$command = ":- <pre>***** php $cron_path schedule:run >> /dev/null 2>&1</pre>"; $command = ":- <pre>***** php $cron_path schedule:run > /dev/null 2>&1</pre>";
$shared = ":- <pre>/usr/bin/php-cli -q $cron_path schedule:run >> /dev/null 2>&1</pre>"; $shared = ":- <pre>/usr/bin/php-cli -q $cron_path schedule:run > /dev/null 2>&1</pre>";
$warn = ''; $warn = '';
$condition = new \App\Model\MailJob\Condition(); $condition = new \App\Model\MailJob\Condition();
$job = $condition->checkActiveJob(); $job = $condition->checkActiveJob();

10
app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View File

@@ -61,6 +61,16 @@ class OrganizationController extends Controller
} }
} }
/**
* This function is used autofill organizations name .
*
* @return datatable
*/
public function organizationAutofill()
{
return view('themes.default1.agent.helpdesk.organization.getautocomplete');
}
/** /**
* This function is used to display the list of Organizations. * This function is used to display the list of Organizations.
* *

40
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -1897,41 +1897,11 @@ class TicketController extends Controller
foreach ($selectall as $delete) { foreach ($selectall as $delete) {
$ticket = Tickets::whereId($delete)->first(); $ticket = Tickets::whereId($delete)->first();
if ($value == 'Delete') { if ($value == 'Delete') {
$ticket->status = 5; $this->delete($delete, new Tickets());
$ticket->save();
$data = [
'id' => $ticket->ticket_number,
'status' => 'Deleted',
'first_name' => Auth::user()->first_name,
'last_name' => Auth::user()->last_name,
];
\Event::fire('change-status', [$data]);
} elseif ($value == 'Close') { } elseif ($value == 'Close') {
$ticket->status = 2; $this->close($delete, new Tickets());
$ticket->closed = 1;
$ticket->closed_at = date('Y-m-d H:i:s');
$ticket->save();
$data = [
'id' => $ticket->ticket_number,
'status' => 'Closed',
'first_name' => Auth::user()->first_name,
'last_name' => Auth::user()->last_name,
];
\Event::fire('change-status', [$data]);
} elseif ($value == 'Open') { } elseif ($value == 'Open') {
$ticket->status = 1; $this->open($delete, new Tickets());
$ticket->reopened = 1;
$ticket->reopened_at = date('Y-m-d H:i:s');
$ticket->closed = 0;
$ticket->closed_at = null;
$ticket->save();
$data = [
'id' => $ticket->ticket_number,
'status' => 'Open',
'first_name' => Auth::user()->first_name,
'last_name' => Auth::user()->last_name,
];
\Event::fire('change-status', [$data]);
} elseif ($value == 'Delete forever') { } elseif ($value == 'Delete forever') {
$notification = Notification::select('id')->where('model_id', '=', $ticket->id)->get(); $notification = Notification::select('id')->where('model_id', '=', $ticket->id)->get();
foreach ($notification as $id) { foreach ($notification as $id) {
@@ -1947,7 +1917,7 @@ class TicketController extends Controller
$attachment = Ticket_attachments::where('thread_id', '=', $th_id->id)->get(); $attachment = Ticket_attachments::where('thread_id', '=', $th_id->id)->get();
if (count($attachment)) { if (count($attachment)) {
foreach ($attachment as $a_id) { foreach ($attachment as $a_id) {
echo $a_id->id.' '; // echo $a_id->id . ' ';
$attachment = Ticket_attachments::find($a_id->id); $attachment = Ticket_attachments::find($a_id->id);
$attachment->delete(); $attachment->delete();
} }
@@ -1960,7 +1930,7 @@ class TicketController extends Controller
$collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket->id)->get(); $collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket->id)->get();
if (count($collaborators)) { if (count($collaborators)) {
foreach ($collaborators as $collab_id) { foreach ($collaborators as $collab_id) {
echo $collab_id->id; // echo $collab_id->id;
$collab = Ticket_Collaborator::find($collab_id->id); $collab = Ticket_Collaborator::find($collab_id->id);
$collab->delete(); $collab->delete();
} }

7
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -465,7 +465,7 @@ class UserController extends Controller
$ticket = Tickets::where('assigned_to', '=', $id)->where('status', '=', '1')->get(); $ticket = Tickets::where('assigned_to', '=', $id)->where('status', '=', '1')->get();
if ($assign_to[0] == 'user') { if ($assign_to[0] == 'user') {
if ($users->id == $assign_to[1]) { if ($users->id == $assign_to[1]) {
return redirect('user')->with('warning', Lang::get('lang.select_another_user')); return redirect('user')->with('warning', Lang::get('lang.select_another_agent'));
} }
$user_detail = User::where('id', '=', $assign_to[1])->first(); $user_detail = User::where('id', '=', $assign_to[1])->first();
$assignee = $user_detail->first_name.' '.$user_detail->last_name; $assignee = $user_detail->first_name.' '.$user_detail->last_name;
@@ -491,7 +491,7 @@ class UserController extends Controller
$user = User::find($id); $user = User::find($id);
$user->delete(); $user->delete();
return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_user')); return redirect('user')->with('success', Lang::get('lang.agent_delete_successfully_and_ticket_assign_to_another_agent'));
} }
if (User_org::where('user_id', '=', $id)) { if (User_org::where('user_id', '=', $id)) {
DB::table('user_assign_organization')->where('user_id', '=', $id)->delete(); DB::table('user_assign_organization')->where('user_id', '=', $id)->delete();
@@ -747,7 +747,8 @@ class UserController extends Controller
*/ */
public function UserAssignOrg($id) public function UserAssignOrg($id)
{ {
$org = Input::get('org'); $org_name = Input::get('org');
$org = Organization::where('name', '=', $org_name)->lists('id')->first();
$user_org = new User_org(); $user_org = new User_org();
$user_org->org_id = $org; $user_org->org_id = $org;
$user_org->user_id = $id; $user_org->user_id = $id;

1
app/Http/routes.php
View File

@@ -505,6 +505,7 @@ Route::group(['middleware' => ['web']], function () {
$breadcrumbs->push(Lang::get('lang.view_organization_profile'), url('organizations/{organizations}')); $breadcrumbs->push(Lang::get('lang.view_organization_profile'), url('organizations/{organizations}'));
}); });
Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']); Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']);
Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']); //auto fill organization name//
Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']); Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']);
Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData'); Route::get('org-chart/{id}', 'Agent\helpdesk\OrganizationController@orgChartData');
// Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']); // Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);

1
bootstrap/autoload.php
View File

@@ -2,7 +2,6 @@
ini_set('xdebug.max_nesting_level', 500); ini_set('xdebug.max_nesting_level', 500);
ini_set('memory_limit', '256M'); ini_set('memory_limit', '256M');
ini_set('max_execution_time', 300);
define('LARAVEL_START', microtime(true)); define('LARAVEL_START', microtime(true));
/* /*

22
resources/lang/en/lang.php
View File

@@ -1507,23 +1507,27 @@ return [
* User Module * User Module
* -------------------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
*/ */
'agent_report' => 'Agent Report',
'assign_tickets' => 'Assign Tickets',
'delete_agent' => 'Delete Agent',
'delete_user' => 'Delete User',
'confirm_deletion' => 'Confirm Deletion', 'confirm_deletion' => 'Confirm Deletion',
'delete_all_content' => ' Delete all content', 'delete_all_content' => ' Delete all content',
'agent_profile' => 'Agent Profile', 'agent_profile' => 'Agent Profile',
'change_role_to_admin' => 'Change Role To Admin', 'change_role_to_admin' => 'Change role to Admin',
'change_role_to_user' => 'Change Role To User', 'change_role_to_user' => 'Change role to User',
'change_role_to_agent' => 'Change Role To Agent', 'change_role_to_agent' => 'Change role to Agent',
'change_password' => 'Change Password', 'change_password' => 'Change Password',
'role_change' => 'Role Change', 'role_change' => 'Role Change',
'password_generator' => 'Password Generator', 'password_generator' => 'Password Generator',
'depertment' => 'Depertment', 'depertment' => 'Depertment',
'duetoday' => 'Due Today', 'duetoday' => 'Due Today',
'today-due_tickets' => 'Today\'s due ticekts', 'today-due_tickets' => 'Today\'s due ticekts',
'password_change_successfully' => 'Password Change Successfully', 'password_change_successfully' => 'Password changed successfully',
'role_change_successfully' => 'Role Change Successfully', 'role_change_successfully' => 'Role changed successfully',
'user_delete_successfully' => 'User Delete Successfully', 'user_delete_successfully' => 'User deleted successfully',
'agent_delete_successfully' => 'Agent Delete Successfully', 'agent_delete_successfully' => 'Agent deleted successfully',
'select_another_user' => 'Select Another User', 'select_another_agent' => 'Select another agent',
'agent_delete_successfully_and_ticket_assign_to_another_user' => 'Agent Delete Successfully And Ticket Assign TO Another User', 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent',
]; ];

1404
resources/lang/fr/lang.php Normal file
View File

File diff suppressed because it is too large Load Diff

18
resources/lang/fr/pagination.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Pagination Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used by the paginator library to build
| the simple pagination links. You are free to change them to anything
| you want to customize your views to better match your application.
|
*/
'previous' => '&laquo; Précédent',
'next' => 'Suivant &raquo;',
];

21
resources/lang/fr/passwords.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Password Reminder Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are the default lines which match reasons
| that are given by the password broker for a password update attempt
| has failed, such as for an invalid token or invalid new password.
|
*/
'password' => 'Les mots de passe doivent contenir au moins six caractères pour pouvoir être confirmés.',
'user' => "Nous n'avons pu trouvder d\'utilisateur avec cette adresse email.",
'token' => 'Ce jeton de réinitialisation de mot de passe est invalide.',
'sent' => 'Nous vous avons envoyé votre lien de réinitialisation par email!',
'reset' => 'Votre mot de passe a été réinitialisé',
];

102
resources/lang/fr/validation.php Normal file
View File

@@ -0,0 +1,102 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/
'accepted' => 'Le :attribute doit être accepté.',
'active_url' => 'Le :attribute n\'est pas une URL valide.',
'after' => 'Le :attribute doit être une date après la date :date.',
'alpha' => 'Le :attribute ne peut contenir que des lettres.',
'alpha_dash' => 'Le :attribute ne peut contenir que des lettres, des nombres, et des tirets.',
'alpha_num' => 'Le :attribute may ne peut contenir que des lettres et des nombres.',
'array' => 'Le :attribute doit être un tableau.',
'before' => 'Le :attribute doit être une date avant la date :date.',
'between' => [
'numeric' => 'Le :attribute doit être entre :min et :max.',
'file' => 'Le :attribute doit être entre :min et :max ko.',
'string' => 'Le :attribute doit être entre :min et :max caractères.',
'array' => 'Le :attribute doit avoir entre :min et :max éléments.',
],
'boolean' => 'Le :attribute champ doit être true ou false.',
'confirmed' => 'Le :attribute confirmation ne correspond pas.',
'date' => 'Le :attribute n\'est pas une date valide.',
'date_format' => 'Le :attribute ne correspond pas au format :format.',
'different' => 'Le :attribute et :other doivent être différents.',
'digits' => 'Le :attribute doit être composé de :digits numéros.',
'digits_between' => 'Le :attribute doit être entre :min et :max numéros.',
'email' => 'Le :attribute doit être une adresse email valide.',
'filled' => 'Le :attribute field is required.',
'exists' => 'Le :attribute sélectionné est invalide.',
'image' => 'Le :attribute doit être une image.',
'in' => 'Le :attribute sélectionné est invalide.',
'integer' => 'Le :attribute doit être un integer.',
'ip' => 'Le :attribute doit être une adresse IP valide.',
'max' => [
'numeric' => 'Le :attribute ne peut pas être plus grand que :max.',
'file' => 'Le :attribute ne peut pas être plus grand que :max Ko.',
'string' => 'Le :attribute ne peut pas être plus grand que :max caractères.',
'array' => 'Le :attribute ne peut pas avoir plus de :max éléments.',
],
'mimes' => 'Le :attribute doit être un fichier de type: :values.',
'min' => [
'numeric' => 'Le :attribute doit être au moins :min.',
'file' => 'Le :attribute doit être au moins :min ko.',
'string' => 'Le :attribute doit être au moins :min caractères.',
'array' => 'Le :attribute doit au moins avoir :min éléments.',
],
'not_in' => 'Le :attribute sélectionné est invalide.',
'numeric' => 'Le :attribute doit être un nombre.',
'regex' => 'Le format de :attribute est invalide.',
'required' => 'Le champ :attribute est obligatoire.',
'required_if' => 'Le champ :a formatttribute est requis lorsque :other est :value.',
'required_with' => 'Le champ :attribute est requis lorsque :values is present.',
'required_with_all' => 'Le champ :attribute est requis lorsque :values is present.',
'required_without' => 'Le champ :attribute est requis lorsque :values is not present.',
'required_without_all' => 'Le champ :attribute est requis lorsque pas de :values sont présents.',
'same' => 'Le champ :attribute et :other doivent correspondre.',
'size' => [
'numeric' => 'Le :attribute doit être de :size.',
'file' => 'Le :attribute doit être de :size ko.',
'string' => 'Le :attribute doit être de :size caractères.',
'array' => 'Le :attribute doit contenir :size éléments.',
],
'unique' => 'Le :attribute ha déjà été pris.',
'url' => 'Le format de :attribute est invalide.',
'timezone' => 'Le :attribute doit être une zone valide.',
/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
|--------------------------------------------------------------------------
|
| Here you may specify custom validation messages for attributes using the
| convention "attribute.rule" to name the lines. This makes it quick to
| specify a specific custom language line for a given attribute rule.
|
*/
'custom' => [
'attribute-name' => [
'rule-name' => 'custom-message',
],
],
/*
|--------------------------------------------------------------------------
| Custom Validation Attributes
|--------------------------------------------------------------------------
|
| The following language lines are used to swap attribute place-holders
| with something more reader friendly such as E-Mail Address instead
| of "email". This simply helps us make messages a little cleaner.
|
*/
'attributes' => [],
];

19
resources/views/themes/default1/agent/helpdesk/organization/getautocomplete.blade.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
$term = $_GET["term"];
$organizations =App\Model\helpdesk\Agent_panel\Organization::where('name', 'LIKE', '%' . $term . '%')->get();
$json = array();
foreach ($organizations as $organization) {
$json[] = array(
'value' => $organization["name"],
'label' => $organization["name"],
'org' => $organization["name"],
);
}
echo json_encode($json);

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

@@ -200,7 +200,7 @@ if ($thread->title != "") {
<?php <?php
$priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first(); $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first();
?> ?>
<div class="callout callout-{{$priority->priority_color}}"> <div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}'>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<?php <?php

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

@@ -54,7 +54,7 @@ class="active"
@endif @endif
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="box box-primary"> <div class="box box-primary" >
<div class="box-header"> <div class="box-header">
<!-- <a href="{{route('user.edit', $users->id)}}" data-toggle="tooltip" data-placement="left" class="pull-right" title="{!! Lang::get('lang.edit') !!}"><i class="fa fa-edit"></i></a> --> <!-- <a href="{{route('user.edit', $users->id)}}" data-toggle="tooltip" data-placement="left" class="pull-right" title="{!! Lang::get('lang.edit') !!}"><i class="fa fa-edit"></i></a> -->
</div> </div>
@@ -84,6 +84,7 @@ class="active"
{{str_limit($users->email,10) }} {{str_limit($users->email,10) }}
</a> </a>
</div> </div>
@if($users->role=='user')
<div class="box-footer"> <div class="box-footer">
<div id="refresh-org"> <div id="refresh-org">
<?php <?php
@@ -93,12 +94,19 @@ class="active"
<b>{!! Lang::get('lang.organization') !!}</b> <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="" 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')}} |&nbsp;</a> <a href="" data-toggle="modal" data-target="#create_org" class="pull-right"> {{Lang::get('lang.create')}} |&nbsp;</a>
@else @endif
@if($user_org != null)
<?php <?php
$org_id = $user_org->org_id; $org_id = $user_org->org_id;
$organization = App\Model\helpdesk\Agent_panel\Organization::where('id', '=', $org_id)->first(); $organization = App\Model\helpdesk\Agent_panel\Organization::where('id', '=', $org_id)->first();
?> ?>
<b>{!! Lang::get('lang.organization') !!}</b> <b>{!! Lang::get('lang.organization') !!}</b>
&nbsp;&nbsp;&nbsp;
<span style="color:green;">{{$organization->name}}</span>
<a class="pull-right" href="#" data-toggle="modal" data-target="#{{$org_id}}delete" title="{!! Lang::get('lang.remove') !!}"><i class="fa fa-times" style="color:red;"> </i></a> <a class="pull-right" href="#" data-toggle="modal" data-target="#{{$org_id}}delete" title="{!! Lang::get('lang.remove') !!}"><i class="fa fa-times" style="color:red;"> </i></a>
<div class="modal fade" id="{{$org_id}}delete"> <div class="modal fade" id="{{$org_id}}delete">
<div class="modal-dialog"> <div class="modal-dialog">
@@ -121,6 +129,7 @@ class="active"
</div> </div>
</div> </div>
@endif
<div class="box-footer"> <div class="box-footer">
<b>{{Lang::get('lang.role')}}</b> <b>{{Lang::get('lang.role')}}</b>
@@ -179,33 +188,8 @@ class="active"
@endif @endif
</div> </div>
</div> </div>
<div class="col-md-6 pull-right"> <div class="col-md-9" style="margin-left:-10px;">
<!-- <div class="box box-primary"> -->
<div class="box-body">
@if(Auth::user()->role == 'admin')
@if($users->role == 'user')
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal1">{{Lang::get('lang.change_role_to_agent')}}</button>
</div>
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal4">{{Lang::get('lang.change_role_to_admin')}}</button>
</div>
@else
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal2">{{Lang::get('lang.change_role_to_user')}}</button>
<!-- <button type="button" class="btn btn-primary" id="role_user">Change Role TO User</button> -->
</div>
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal4">{{Lang::get('lang.change_role_to_admin')}}</button>
</div>
@endif
@endif
<a href="{{route('user.edit', $users->id)}}"><button type="button" href="{{route('user.edit', $users->id)}}" class="btn btn-primary btn-sm">{{Lang::get('lang.edit')}}</button></a>
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal">{{Lang::get('lang.change_password')}}</button>
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal3">{{Lang::get('lang.delete')}}</button>
<!-- <button type="button" class="btn btn-primary">Delete</button> -->
</div>
</div>
<!-- Delete --> <!-- Delete -->
<form action="{!!URL::route('user.post.delete', $users->id)!!}" method="post" role="form"> <form action="{!!URL::route('user.post.delete', $users->id)!!}" method="post" role="form">
@@ -216,7 +200,14 @@ class="active"
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span> aria-hidden="true">&times;</span>
</button> </button>
<h4 class="modal-title" id="titleLabel">Delete Agent</h4> @if($users->role=='user')
<h4 class="modal-title" id="titleLabel">{{Lang::get('lang.delete_user')}}</h4>
@endif
@if($users->role=='agent')
<h4 class="modal-title" id="titleLabel">{{Lang::get('lang.delete_agent')}}</h4>
@endif
</div> </div>
<div class="modal-body"> <div class="modal-body">
@@ -288,6 +279,7 @@ class="active"
</div> </div>
</div> </div>
</form> </form>
</div>
<!-- Role --> <!-- Role -->
<!-- Admin --> <!-- Admin -->
<form action="{!!URL::route('user.post.rolechangeadmin', $users->id)!!}" method="post" role="form"> <form action="{!!URL::route('user.post.rolechangeadmin', $users->id)!!}" method="post" role="form">
@@ -500,7 +492,37 @@ class="active"
<div class="col-md-12"> <div class="col-md-12">
<!-- Custom Tabs --> <!-- Custom Tabs -->
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs"> <div class="box box-primary">
</br>
<div style="margin-left:1%;">
@if(Auth::user()->role == 'admin')
@if($users->role == 'user')
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal1">{{Lang::get('lang.change_role_to_agent')}}</button>
</div>
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal4">{{Lang::get('lang.change_role_to_admin')}}</button>
</div>
@else
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal2">{{Lang::get('lang.change_role_to_user')}}</button>
<!-- <button type="button" class="btn btn-primary" id="role_user">Change Role TO User</button> -->
</div>
<div class="btn-group">
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal4">{{Lang::get('lang.change_role_to_admin')}}</button>
</div>
@endif
@endif
<a href="{{route('user.edit', $users->id)}}"><button type="button" href="{{route('user.edit', $users->id)}}" class="btn btn-primary btn-sm">{{Lang::get('lang.edit')}}</button></a>
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal">{{Lang::get('lang.change_password')}}</button>
<button type="button" href="#myPopup" data-rel="popup" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addNewCategoryModal3">{{Lang::get('lang.delete')}}</button>
<!-- <button type="button" class="btn btn-primary">Delete</button> -->
</div>
<div style="padding:1%;">
<ul class="nav nav-tabs" >
</br>
<li class="active"><a href="#tab_1" data-toggle="tab">{!! Lang::get('lang.open_tickets') !!} ({{$open}})</a></li> <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_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> <li><a href="#tab_3" data-toggle="tab">{!! Lang::get('lang.deleted_tickets') !!} ({{$deleted}})</a></li>
@@ -877,15 +899,25 @@ class="active"
</div><!-- /.tab-content --> </div><!-- /.tab-content -->
</div><!-- nav-tabs-custom --> </div><!-- nav-tabs-custom -->
</div><!-- /.col --> </div><!-- /.col -->
</div> <!-- /.row -->
</div> </div>
@if(Auth::user()->role == 'user') </div>
<!-- /.row -->
</div>
</div>
@if(Auth::user()->role == 'admin')
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<link type="text/css" href="{{asset("lb-faveo/css/bootstrap-datetimepicker4.7.14.min.css")}}" rel="stylesheet"> <link type="text/css" href="{{asset("lb-faveo/css/bootstrap-datetimepicker4.7.14.min.css")}}" rel="stylesheet">
<div class="box box-info"> <div class="box box-info">
<div class="box-header with-border"> <div class="box-header with-border">
@if($users->role=='user')
<h3 class="box-title">{!! Lang::get('lang.user_report') !!}</h3> <h3 class="box-title">{!! Lang::get('lang.user_report') !!}</h3>
@endif
@if($users->role=='agent')
<h3 class="box-title">{!! Lang::get('lang.agent_report') !!}</h3>
@endif
</div> </div>
<div class="box-body"> <div class="box-body">
<form id="foo"> <form id="foo">
@@ -943,7 +975,17 @@ class="active"
<style> <style>
#legend-holder { border: 1px solid #ccc; float: left; width: 25px; height: 25px; margin: 1px; } #legend-holder { border: 1px solid #ccc; float: left; width: 25px; height: 25px; margin: 1px; }
</style> </style>
@if($users->role=='user')
<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: #6C96DF;"></span>&nbsp; <span class="lead"> <span id="total-created-tickets" ></span> {!! Lang::get('lang.tickets') !!} {!! Lang::get('lang.created') !!} </span></div>
@endif
@if($users->role=='agent')
<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.assign_tickets') !!} </span></div>
@endif
<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: #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 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>
@@ -1097,16 +1139,9 @@ class="active"
</div> </div>
<div id="assign_body"> <div id="assign_body">
<p>{!! Lang::get('lang.please_select_an_organization') !!}</p> <p>{!! Lang::get('lang.please_select_an_organization') !!}</p>
<select id="org" class="form-control" name="org">
<?php <input type="text" id="org" class="form-control" name="org">
$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> </div>
<div class="modal-footer"> <div class="modal-footer">
@@ -1154,6 +1189,29 @@ class="active"
}); });
}); });
// autocomplete organization name
$(document).ready(function(){
$("#org").autocomplete({
source:"{!!URL::route('post.organization.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;
// if(ui.item.first_name) {
// this.form.first_name.value = ui.item.first_name;
// }
// if(ui.item.last_name) {
// this.form.last_name.value = ui.item.last_name;
// }
}
});
});
//close autocomplite
$(function () { $(function () {
//Enable check and uncheck all functionality //Enable check and uncheck all functionality
$(".checkbox-toggle").click(function () { $(".checkbox-toggle").click(function () {