diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 2026557c9..7adc58319 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -18,9 +18,11 @@ return [
| Error
|--------------------------------------
*/
- 'success' => 'Success',
- 'fails' => 'Fails',
- 'alert' => 'Alert',
+ 'success' => 'Success',
+ 'fails' => 'Fails',
+ 'alert' => 'Alert',
+ 'required-error' => 'Please fill all required feilds',
+ 'invalid' => 'Incorrect User id or password',
/*
|--------------------------------------
| Login Page
@@ -115,6 +117,7 @@ return [
'from_name' => 'From Name',
'add_an_email' => 'Add an Email',
'edit_an_email' => 'Edit an Email',
+ 'disable_for_this_email_address' => 'Disable for this Email address',
/*
|--------------------------------------
| Ban Emails Create Page
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 664bde428..e456ef28b 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -14,28 +14,27 @@
{!! Lang::get('lang.alert') !!}!
×
+ @if(Session::has('error'))
+
{!! Session::get('error') !!}
+ @else
+ Please fill all required feilds.
+ @endif
@endif
-@if(Session::has('error'))
-
- ×
-
{!! Session::get('error') !!}
-
-@endif
{!! Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!}
{!! Form::text('email',null,['placeholder'=> Lang::get("lang.email") ,'class' => 'form-control']) !!}
- {!! $errors->first('email', ':message ') !!}
+
{!! Form::password('password',['placeholder'=>Lang::get("lang.password"),'class' => 'form-control']) !!}
- {!! $errors->first('password', ':message ') !!}
+
diff --git a/resources/views/emails/default/create-ticket.blade.php b/resources/views/emails/default/create-ticket.blade.php
index c0d17a6c1..2b158d766 100644
--- a/resources/views/emails/default/create-ticket.blade.php
+++ b/resources/views/emails/default/create-ticket.blade.php
@@ -1 +1 @@
-
Hello {!!$user!!} Thank you for contacting us. This is an automated response confirming the receipt of your ticket. Our team will get back to you as soon as possible. When replying, please make sure that the ticket ID is kept in the subject so that we can track your replies. Ticket ID: {!!$ticket_number!!} {!!$department_sign!!} You can check the status of or update this ticket online at: {!!$system_link!!}
\ No newline at end of file
+
Hello {!!$user!!} Thank you for contacting us. This is an automated response confirming the receipt of your ticket. Our team will get back to you as soon as possible. When replying, please make sure that the ticket ID is kept in the subject so that we can track your replies. Ticket ID: {!!$ticket_number!!} {!!$department_sign!!} You can check the status of or update this ticket online at: {!!$system_link!!}
\ No newline at end of file
diff --git a/resources/views/emails/default/ticket-reply-agent.blade.php b/resources/views/emails/default/ticket-reply-agent.blade.php
index 2466c999b..808423309 100644
--- a/resources/views/emails/default/ticket-reply-agent.blade.php
+++ b/resources/views/emails/default/ticket-reply-agent.blade.php
@@ -1 +1 @@
-
{!!$content!!}
{!!$agent_sign!!}
Ticket Details
Ticket ID: {!!$ticket_number!!}
\ No newline at end of file
+
Hello {!!$ticket_agent_name!!}, A reply been made to ticket {!!$ticket_number!!} From Name: {!!$ticket_client_name!!} E-mail: {!!$ticket_client_email!!} {!!$content!!} Kind Regards, {!!$system_from!!}
\ No newline at end of file
diff --git a/resources/views/emails/default/ticket-reply.blade.php b/resources/views/emails/default/ticket-reply.blade.php
index eec6eff32..e168b586b 100644
--- a/resources/views/emails/default/ticket-reply.blade.php
+++ b/resources/views/emails/default/ticket-reply.blade.php
@@ -1 +1 @@
-
{!!$content!!}
{!!$agent_signature!!}
Ticket Details
Ticket ID: {!!$ticket_number!!}
\ No newline at end of file
+
{!!$content!!}
{!!$agent_sign!!}
Ticket Details
Ticket ID: {!!$ticket_number!!}
\ No newline at end of file
diff --git a/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php
index fb2f65271..925301542 100644
--- a/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/agent/teams/create.blade.php
@@ -78,7 +78,7 @@ class="active"
{!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}
- {!! Form::radio('status','0',null) !!} {{Lang::get('lang.disabled')}}
+ {!! Form::radio('status','0',null) !!} {{Lang::get('lang.inactive')}}
diff --git a/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php
index b8da7d035..d1495682d 100644
--- a/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/agent/teams/edit.blade.php
@@ -76,7 +76,7 @@ class="active"
{!! Form::radio('status','1',true) !!} {{Lang::get('lang.active')}}
- {!! Form::radio('status','0',null) !!} {{Lang::get('lang.disabled')}}
+ {!! Form::radio('status','0',null) !!} {{Lang::get('lang.inactive')}}
diff --git a/resources/views/themes/default1/admin/helpdesk/emails/emails/create.blade.php b/resources/views/themes/default1/admin/helpdesk/emails/emails/create.blade.php
index 7571d2c9c..896de35a7 100644
--- a/resources/views/themes/default1/admin/helpdesk/emails/emails/create.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/emails/emails/create.blade.php
@@ -87,6 +87,14 @@ class="active"
{!! $errors->first('help_topic', ':message ') !!}
{!!Form::select('help_topic', [''=>'--System Default--','Help Topics'=>$helps->lists('topic','id')],null,['class' => 'form-control select', 'id' => 'help_topic']) !!}
+
+
+ {!! Form::label('auto_response',Lang::get('lang.auto_response')) !!}
+
+
+
+ {{Lang::get('lang.disable_for_this_email_address')}}
+
+
+
+ {!! Form::label('auto_response', Lang::get('lang.auto_response')) !!}
+
+
+ auto_response == 1) {
+ echo "checked='checked'";
+} ?>> {!!Lang::get('lang.disable_for_this_email_address')!!}
+
+
@endif
@@ -60,7 +60,7 @@ class="active"
Fail!
×
- {{Session::get('fails')}}
+ {!!Session::get('fails')!!}
@endif
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/alert.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/alert.blade.php
index 6503cf361..fe8b4b73d 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/alert.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/alert.blade.php
@@ -46,7 +46,7 @@ class="active"
Success!
×
- {{Session::get('success')}}
+ {!!Session::get('success')!!}
@endif
@@ -55,7 +55,7 @@ class="active"
Fail!
×
- {{Session::get('fails')}}
+ {!!Session::get('fails')!!}
@endif
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/checkupdate.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/checkupdate.blade.php
index 3943eb172..7c64f1da2 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/checkupdate.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/checkupdate.blade.php
@@ -11,7 +11,7 @@
Info!
×
- {{Session::get('info')}}
+ {!!Session::get('info')!!}
@endif
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php
index cee03915b..e69e60b8f 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/company.blade.php
@@ -47,7 +47,7 @@ class="active"
Success!
×
- {{Session::get('success')}}
+ {!!Session::get('success')!!}
@endif
@@ -56,7 +56,7 @@ class="active"
Fail!
×
- {{Session::get('fails')}}
+ {!!Session::get('fails')!!}
@endif
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php
index cd9b6cf86..d35b73870 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/email.blade.php
@@ -44,7 +44,7 @@ class="active"
Success!
×
- {{Session::get('success')}}
+ {!!Session::get('success')!!}
@endif
@@ -53,7 +53,7 @@ class="active"
Fail!
×
- {{Session::get('fails')}}
+ {!!Session::get('fails')!!}
@endif
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/plugins.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/plugins.blade.php
index 4dc0ff272..4b65129f0 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/plugins.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/plugins.blade.php
@@ -79,7 +79,7 @@ class="active"
Success!
×
- {{Session::get('success')}}
+ {!!Session::get('success')!!}
@endif
@@ -88,7 +88,7 @@ class="active"
Alert! Failed.
×
- {{Session::get('fails')}}
+ {!!Session::get('fails')!!}
@endif
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/responder.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/responder.blade.php
index 29ac38c0c..b1c23083a 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/responder.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/responder.blade.php
@@ -50,7 +50,7 @@ class="active"
Success!
×
- {{Session::get('success')}}
+ {!!Session::get('success')!!}
@endif
@@ -59,7 +59,7 @@ class="active"
Fail!
×
- {{Session::get('fails')}}
+ {!!Session::get('fails')!!}
@endif
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php
index 7467998a0..dfe7fad38 100644
--- a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php
@@ -48,7 +48,7 @@ class="active"
Success!
×
- {{Session::get('success')}}
+ {!!Session::get('success')!!}
@endif
@@ -57,7 +57,7 @@ class="active"
Fail!
×
- {{Session::get('fails')}}
+ {!!Session::get('fails')!!}
@endif
diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php
index 4492b04f5..d109c2ea3 100644
--- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/closed.blade.php
@@ -25,7 +25,12 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
@if(Session::has('success'))
@@ -44,192 +49,375 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
{{Session::get('fails')}}
@endif
-
- {!! Form::open(['route'=>'select_all','method'=>'post']) !!}
+
+ {!! Form::open(['id'=>'modalpopup', 'route'=>'select_all','method'=>'post']) !!}
-
-
Loading...
+
+
{!! Lang::get('lang.loading') !!}...
-
-
-
-
- Subject
- Ticket ID
- Priority
- From
- Last Replier
- Assigned To
- Last Activity
-
-
-
- @foreach ($tickets as $ticket)
- addColumn(
+ "",
+ Lang::get('lang.subject'),
+ Lang::get('lang.ticket_id'),
+ Lang::get('lang.priority'),
+ Lang::get('lang.from'),
+ Lang::get('lang.last_replier'),
+ Lang::get('lang.assigned_to'),
+ Lang::get('lang.last_activity'))
+ ->setUrl(route('get.dept.close', $dept->id))
+ ->setOrder(array(7=>'desc'))
+ ->setClass('table table-hover table-bordered table-striped')
+ ->render();!!}
- $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
- $string = strip_tags($title->title);
- if($title)
- if($title == null){
-
- } else {
- ?>
- seen_by == null) {?> style="color:green;" >
-
- id)->get();
- $collab = count($collaborators);
-
- // 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;
- }
- ?>
- {{$string}} ({!! $count!!})
- @if($collab > 0) @endif
- @if($attach > 0) @endif
- #{!! $ticket->ticket_number !!}
- priority_id)->first();?>
- {{$priority->priority_desc}}
- user_id)->first(); ?>
- @if($from->role == "user")
- {!! $from->user_name !!}
- @else
- {!! $from->first_name." ".$from->last_name !!}
- @endif
- {!! $username !!}
- {!! $assigned !!}
- {!! UTC::usertimezone($title->updated_at) !!}
-
-
- @endforeach
-
-
-
-
- setPath(url('/ticket/inbox'))->render();?>
-
{!! Form::close() !!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {!! Form::open(['id'=>'merge-form','method' => 'PATCH'] )!!}
+ {!! Lang::get('lang.title') !!}
+
+
+
+ {!! Lang::get('lang.select-pparent-ticket') !!}
+
+
+
+
+
+
+ {!! Lang::get('lang.merge-reason') !!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@stop
\ No newline at end of file
diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php
index 634d4d7e3..a581e073e 100644
--- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/inprogress.blade.php
@@ -13,19 +13,25 @@ class="active"
@stop
@section('content')
-first();
- if(Auth::user()->role == 'agent') {
+
+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);
- } 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')->paginate(20);
+} else {
+ $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', '1')->where('assigned_to', '>', 0)->where('dept_id', '=', $dept->id)->orderBy('id', 'DESC')->paginate(20);
+}
?>
@if(Session::has('success'))
@@ -44,192 +50,375 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
{{Session::get('fails')}}
@endif
-
- {!! Form::open(['route'=>'select_all','method'=>'post']) !!}
+
+ {!! Form::open(['id'=>'modalpopup', 'route'=>'select_all','method'=>'post']) !!}
-
-
Loading...
+
+
{!! Lang::get('lang.loading') !!}...
-
-
-
-
- Subject
- Ticket ID
- Priority
- From
- Last Replier
- Assigned To
- Last Activity
-
-
-
- @foreach ($tickets as $ticket)
- addColumn(
+ "",
+ Lang::get('lang.subject'),
+ Lang::get('lang.ticket_id'),
+ Lang::get('lang.priority'),
+ Lang::get('lang.from'),
+ Lang::get('lang.last_replier'),
+ Lang::get('lang.assigned_to'),
+ Lang::get('lang.last_activity'))
+ ->setUrl(route('get.dept.inprocess', $dept->id))
+ ->setOrder(array(7=>'desc'))
+ ->setClass('table table-hover table-bordered table-striped')
+ ->render();!!}
- $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
- $string = strip_tags($title->title);
- if($title)
- if($title == null){
-
- } else {
- ?>
- seen_by == null) {?> style="color:green;" >
-
- id)->get();
- $collab = count($collaborators);
-
- // 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;
- }
- ?>
- {{$string}} ({!! $count!!})
- @if($collab > 0) @endif
- @if($attach > 0) @endif
- #{!! $ticket->ticket_number !!}
- priority_id)->first();?>
- {{$priority->priority_desc}}
- user_id)->first(); ?>
- @if($from->role == "user")
- {!! $from->user_name !!}
- @else
- {!! $from->first_name." ".$from->last_name !!}
- @endif
- {!! $username !!}
- {!! $assigned !!}
- {!! UTC::usertimezone($title->updated_at) !!}
-
-
- @endforeach
-
-
-
-
- setPath(url('/ticket/inbox'))->render();?>
-
{!! Form::close() !!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {!! Form::open(['id'=>'merge-form','method' => 'PATCH'] )!!}
+ {!! Lang::get('lang.title') !!}
+
+
+
+ {!! Lang::get('lang.select-pparent-ticket') !!}
+
+
+
+
+
+
+ {!! Lang::get('lang.merge-reason') !!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@stop
\ No newline at end of file
diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php
index 4e0f19fb0..e996a4f7c 100644
--- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/open.blade.php
@@ -16,15 +16,20 @@ class="active"
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);
+ $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('assigned_to','=', 0)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
+ $tickets = App\Model\helpdesk\Ticket\Tickets::where('status','=','1')->where('isanswered','=', 0)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
}
?>
@if(Session::has('success'))
@@ -43,192 +48,375 @@ $dept = App\Model\helpdesk\Agent\Department::where('name','=',$id)->first();
{{Session::get('fails')}}
@endif
-
- {!! Form::open(['route'=>'select_all','method'=>'post']) !!}
+
+ {!! Form::open(['id'=>'modalpopup', 'route'=>'select_all','method'=>'post']) !!}
-
-
Loading...
+
+
{!! Lang::get('lang.loading') !!}...
-
-
-
-
- Subject
- Ticket ID
- Priority
- From
- Last Replier
- Assigned To
- Last Activity
-
-
-
- @foreach ($tickets as $ticket)
- addColumn(
+ "",
+ Lang::get('lang.subject'),
+ Lang::get('lang.ticket_id'),
+ Lang::get('lang.priority'),
+ Lang::get('lang.from'),
+ Lang::get('lang.last_replier'),
+ Lang::get('lang.assigned_to'),
+ Lang::get('lang.last_activity'))
+ ->setUrl(route('get.dept.open', $dept->id))
+ ->setOrder(array(7=>'desc'))
+ ->setClass('table table-hover table-bordered table-striped')
+ ->render();!!}
- $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
- $string = strip_tags($title->title);
- if($title)
- if($title == null){
-
- } else {
- ?>
- seen_by == null) {?> style="color:green;" >
-
- id)->get();
- $collab = count($collaborators);
-
- // 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;
- }
- ?>
- {{$string}} ({!! $count!!})
- @if($collab > 0) @endif
- @if($attach > 0) @endif
- #{!! $ticket->ticket_number !!}
- priority_id)->first();?>
- {{$priority->priority_desc}}
- user_id)->first(); ?>
- @if($from->role == "user")
- {!! $from->user_name !!}
- @else
- {!! $from->first_name." ".$from->last_name !!}
- @endif
- {!! $username !!}
- {!! $assigned !!}
- {!! UTC::usertimezone($title->updated_at) !!}
-
-
- @endforeach
-
-
-
-
- setPath(url('/ticket/inbox'))->render();?>
-
{!! Form::close() !!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {!! Form::open(['id'=>'merge-form','method' => 'PATCH'] )!!}
+ {!! Lang::get('lang.title') !!}
+
+
+
+ {!! Lang::get('lang.select-pparent-ticket') !!}
+
+
+
+
+
+
+ {!! Lang::get('lang.merge-reason') !!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@stop
\ No newline at end of file
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php
index 1e7b6511e..6b47ceb4f 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php
@@ -381,8 +381,8 @@ class="active"
if(link) {
link.click();
}
- }, 500);
- },2000);
+ }, 100);
+ },1000);
}
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php
index d58a281b4..75ee082b1 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php
@@ -16,9 +16,9 @@ class="active"
role == 'agent') {
$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);
+ $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('assigned_to', '=', 0)->orderBy('id', 'DESC')->paginate(20);
+ $tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->paginate(20);
}
?>
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
index cc962362a..dc5205057 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -8,7 +8,7 @@ class="active"
active
@stop
-user_id)->first();
$assignedto = App\User::where('id', '=', $tickets->assigned_to)->first();
$agent_group = Auth::user()->assign_group;
@@ -259,7 +259,6 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s'));
@@ -1317,10 +1316,11 @@ jQuery(document).ready(function() {
setInterval(function(){
$("#alert11").hide();
setTimeout(function() {
- var link = document.querySelector('#load-inbox');
- if(link) {
- link.click();
- }
+ // var link = document.querySelector('#load-inbox');
+ // if(link) {
+ // link.click();
+ // }
+ history.go(-1);
}, 500);
},2000);
}
@@ -1347,10 +1347,11 @@ jQuery(document).ready(function() {
$('#message-success1').html(message);
setInterval(function(){$("#alert11").hide();
setTimeout(function() {
- var link = document.querySelector('#load-inbox');
- if(link) {
- link.click();
- }
+ // var link = document.querySelector('#load-inbox');
+ // if(link) {
+ // link.click();
+ // }
+ history.go(-1);
}, 500);
},2000);
}
@@ -1401,10 +1402,11 @@ jQuery(document).ready(function() {
$('#message-success1').html(message);
setInterval(function(){$("#alert11").hide();
setTimeout(function() {
- var link = document.querySelector('#load-inbox');
- if(link) {
- link.click();
- }
+ // var link = document.querySelector('#load-inbox');
+ // if(link) {
+ // link.click();
+ // }
+ history.go(-1);
}, 500);
},2000);
}
@@ -1549,6 +1551,7 @@ jQuery(document).ready(function() {
$("#dismis42").trigger("click");
// $("#RefreshAssign").load( "../thread/{{$tickets->id}} #RefreshAssign");
// $("#General").load( "../thread/{{$tickets->id}} #General");
+ $("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1581,6 +1584,7 @@ jQuery(document).ready(function() {
$('#add-change-loader').hide();
$('#add-change-body').show();
$("#close101").trigger("click");
+ $("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1876,6 +1880,7 @@ jQuery(document).ready(function() {
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
+ $("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1976,11 +1981,12 @@ function lockAjaxCall(locktime){
$('#message-warning2').html(message);
$('#replybtn').attr('disabled', true);
//setInterval(function(){$("#alert23").hide(); },10000);
- } else {
+ } else if(response == 2) {
// alert(response);
// var message = "{{Lang::get('lang.access-ticket')}}"+locktime/(60*1000)
// +"{{Lang::get('lang.minutes')}}";
$("#alert22").hide();
+ $("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1989,6 +1995,19 @@ function lockAjaxCall(locktime){
// $('#message-success2').html(message);
$('#replybtn').attr('disabled', false);
// setInterval(function(){$("#alert21").hide(); },8000);
+ } else {
+ // alert(response);
+ // var message = "{{Lang::get('lang.access-ticket')}}"+locktime/(60*1000)
+ // +"{{Lang::get('lang.minutes')}}";
+ $("#alert22").hide();
+ $("#refresh").load("../thread/{{$tickets->id}} #refresh");
+ // $("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
+ $("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
+ $("#t5").load("../thread/{{$tickets->id}} #t5");
+ // $("#alert21").show();
+ // $('#message-success2').html(message);
+ $('#replybtn').attr('disabled', false);
+ // setInterval(function(){$("#alert21").hide(); },8000);
}
}
})
diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php
index 0dd1a5169..2baef8db8 100644
--- a/resources/views/themes/default1/agent/layout/agent.blade.php
+++ b/resources/views/themes/default1/agent/layout/agent.blade.php
@@ -155,14 +155,14 @@ if ($company != null) {
{{-- --}}
-