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

changes

Browse Source
This commit is contained in:
noor
2023-09-13 11:42:31 +05:30
committed by KNaveenraj-ladybird
parent 1d01b66b15
commit 7f5cae072e
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/lb-faveo/css/bootstrap5.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -139,17 +139,29 @@ if ($thread->title != "") {
if ($group->can_edit_ticket == 1) {
?>
<button type="button" class="btn btn-sm btn-default btn-tool">
<<<<<<< HEAD
<i class="fas fa-edit" style="color:green;"></i> {{trans('lang.edit')}}
=======
<i class="fas fa-edit" style="color:green;"></i> Edit
>>>>>>> 8b838c20f (changes)
</button> <?php } ?>
<?php if ($group->can_assign_ticket == 1) { ?>
<button type="button" class="btn btn-sm btn-default btn-tool">
<<<<<<< HEAD
<i class="fas fa-hand-point-right" style="color:orange;"></i> {{trans('lang.assign')}}
=======
<i class="fas fa-hand-point-right" style="color:orange;"></i> Assign
>>>>>>> 8b838c20f (changes)
</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">
<<<<<<< HEAD
<i class="fas fa-arrows-alt" style="color:red;"></i> {{trans('lang.surrender')}}
=======
<i class="fas fa-arrows-alt" style="color:red;"></i> Surrender
>>>>>>> 8b838c20f (changes)
</button>
@endif
@@ -157,7 +169,11 @@ 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">
<<<<<<< HEAD
<i class="fas fa-print"></i> {{trans('lang.generate_pdf')}}
=======
<i class="fas fa-print"></i> Generate PDF
>>>>>>> 8b838c20f (changes)
</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>

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

@@ -156,7 +156,6 @@
<span class="navbar-toggler-icon"></span>
</button> <!-- collapse -->
@if(count($pages))
<li @yield('pages') class="nav-item dropdown">
<a class="dropdown-toggle nav-link" id="navbarDropdown" role="button" data-toggle=""
@@ -208,7 +207,6 @@
</div>
</div>
</li>
<<<<<<< HEAD
</ul>
</li>
@endif

2
routes/web.php
View File

@@ -366,7 +366,7 @@ Route::middleware('web')->group(function () {
Route::patch('search-user', [Agent\helpdesk\TicketController::class, 'usersearch']);
Route::patch('add-user', [Agent\helpdesk\TicketController::class, 'useradd']);
Route::post('remove-user', [Agent\helpdesk\TicketController::class, 'userremove']);
Route::post('select/all', [Agent\helpdesk\TicketController::class, 'select_all'])->name('select_all');
Route::post('select_all', [Agent\helpdesk\TicketController::class, 'select_all'])->name('select_all');
Route::post('canned/{id}', [Agent\helpdesk\CannedController::class, 'get_canned']);
// Route::get('message' , 'MessageController@show');
Route::post('lock', [Agent\helpdesk\TicketController::class, 'lock'])->name('lock');