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

Merge remote-tracking branch 'origin/pr-8202' into development

Browse Source
This commit is contained in:
RaffiMohammed
2023-10-26 13:34:33 +05:30
parent 13b88b5f9a 75cfc52dbf
commit 8e8e1e531f
69 changed files with 2207 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,7 @@ if (Auth::user()->role == 'agent') {
</div>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default no">{{Lang::get('lang.cancel')}}</button>
<button type="button" class="btn btn-primary yes" data-dismiss="modal">{{Lang::get('lang.ok')}}</button>
<button type="button" class="btn btn-primary yes" data-dismiss="modal">{{Lang::get('lang.yes')}}</button>
</div>
</div>
</div>

2
resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-model.blade.php
View File

@@ -57,7 +57,7 @@
<div class="col-md-6">
{!! Form::open(['id'=>'merge-form','method' => 'PATCH'] )!!}
<label>{!! Lang::get('lang.title') !!}</label>
<input type="text" name='title' class="form-control" value="" placeholder="Optional" />
<input type="text" name='title' class="form-control" value="" placeholder="{{trans('lang.optional')}}" />
</div>
<div class="col-md-6">
<label>{!! Lang::get('lang.select-pparent-ticket') !!}</label>

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

@@ -262,7 +262,7 @@ class="active"
</div>
<div class="col-md-5">
<?php $Priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('status','=',1)->get(); ?>
{!! Form::select('priority', ['Priority'=>$Priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control select']) !!}
{!! Form::select('priority', [Lang::get('lang.priorities')=>$Priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control select']) !!}
</div>
</div>

4
resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
View File

@@ -117,7 +117,7 @@ if (Request::has('assigned'))
@elseif($activepage == 'overdue')
{{Lang::get('lang.overdue')}}
@elseif($activepage == 'closed')
{{Lang::get('lang.closed')}}
{{-- {{Lang::get('lang.closed')}}--}}
@elseif($activepage == 'approval')
{{Lang::get('lang.approval')}}
@elseif($activepage == 0)
@@ -185,7 +185,7 @@ if (Request::has('assigned'))
@foreach($statuses as $ticket_status)
<a href="javascript:;" class="dropdown-item" onclick="changeStatus({!! $ticket_status -> id !!}, '{!! $ticket_status->name !!}')"
data-toggle="modal" data-target="#myModal">
{!! $ticket_status->name !!}
{{trans('lang.'.strtolower($ticket_status->name)) }}
</a>
@endforeach
</div>

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

@@ -1,4 +1,5 @@
@extends('themes.default1.agent.layout.agent')
<meta charset="utf-8">
@section('Tickets')
class="nav-link active"
@@ -138,17 +139,17 @@ if ($thread->title != "") {
if ($group->can_edit_ticket == 1) {
?>
<button type="button" class="btn btn-sm btn-default btn-tool">
<i class="fas fa-edit" style="color:green;"></i> Edit
<i class="fas fa-edit" style="color:green;"></i> {{trans('lang.edit')}}
</button> <?php } ?>
<?php if ($group->can_assign_ticket == 1) { ?>
<button type="button" class="btn btn-sm btn-default btn-tool">
<i class="fas fa-hand-point-right" style="color:orange;"></i> Assign
<i class="fas fa-hand-point-right" style="color:orange;"></i> {{trans('lang.assign')}}
</button> <?php } ?>
@if($tickets->assigned_to == Auth::user()->id)
<button type="button" id="surrender_button" class="btn btn-sm btn-default btn-tool" data-toggle="modal" data-target="#surrender">
<i class="fas fa-arrows-alt" style="color:red;"></i> Surrender
<i class="fas fa-arrows-alt" style="color:red;"></i> {{trans('lang.surrender')}}
</button>
@endif
@@ -156,7 +157,7 @@ if ($thread->title != "") {
<?php \Illuminate\Support\Facades\Event::dispatch('show-add-event-btn', []); ?>
<a href="{{url('ticket/print/'.$tickets->id)}}" target="_blank" class="btn btn-default btn-tool btn-sm">
<i class="fas fa-print"></i> Generate PDF
<i class="fas fa-print"></i> {{trans('lang.generate_pdf')}}
</a> <div class="btn-group">
<button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" id="d1"><i class="fas fa-exchange-alt" style="color:teal;" id="hidespin"> </i><i class="fa fa-spinner fa-spin" style="color:teal; display:none;" id="spin"></i>
{!! Lang::get('lang.change_status') !!} <span class="caret"></span>
@@ -200,7 +201,7 @@ if ($thread->title != "") {
<?php }
?>
<?php if ($group->can_ban_email == 1) { ?>
<a href="#" class="dropdown-item" data-toggle="modal" data-target="#banemail"><i class="fas fa-ban" style="color:red;"></i> {!! Lang::get('lang.ban_email') !!}</a>
<a href="#" class="dropdown-item" data-toggle="modal" data-target="#banemail"><i class="fas fa-ban" style="color:red;"></i> {{trans('lang.ban_email')}}</a>
<?php
\Illuminate\Support\Facades\Event::dispatch('ticket.details.more.list',[$tickets]);
}
@@ -328,7 +329,7 @@ if ($thread->title != "") {
<div class="card-header">
<h3 class="card-title">Actions</h3>
<h3 class="card-title">{{trans('lang.action')}}</h3>
</div>
<div class="card-body">
@@ -515,7 +516,7 @@ if ($thread->title != "") {
<div class="card card-light">
<div class="card-header">
<h3 class="card-title">Ticket Conversation</h3>
<h3 class="card-title">{{trans('lang.ticket_conversation')}}</h3>
</div>
<div class="card-body">
@@ -923,7 +924,7 @@ if ($thread->title != "") {
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">{!! Lang::get('lang.close') !!}</button>
<button id="ban" type="button" class="btn btn-warning" >{!! Lang::get('lang.ban_email') !!}</button>
<button id="ban" type="button" class="btn btn-warning" >{{trans('lang.ban_email')}}</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->