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

Merge branch 'development' into URL_Issue

Browse Source
This commit is contained in:
K Naveenraj
2023-10-05 17:39:58 +05:30
committed by GitHub
parent 3076d1535d aa4b3d2990
commit a3ce1e1e15
14 changed files with 484 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/routes.php
View File

@@ -63,7 +63,7 @@ Route::prefix('api/v1')->group(function () {
/*
* FCM token response
*/
Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken');
//Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken');
});
/*
* ================================================================================================

2
app/Http/Controllers/Client/helpdesk/UnAuthController.php
View File

@@ -361,8 +361,6 @@ class UnAuthController extends Controller
} else {
Session::put('language', $lang);
}
}
return redirect()->back();
}

31
phpunit.xml Normal file → Executable file
View File

@@ -1,36 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="bootstrap/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="bootstrap/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage includeUncoveredFiles="true">
<include>
<directory suffix=".php">app/</directory>
</include>
</coverage>
<testsuites>
<testsuite name="all">
<directory>./tests/</directory>
<testsuite name="feature">
<directory>tests/Feature</directory>
</testsuite>
<testsuite name="unit">
<directory>./tests/unit</directory>
<directory>tests/Unit</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">app/</directory>
</whitelist>
</filter>
<php>
<env name="APP_ENV" value="testing"/>
<env name="DB_CONNECTION" value="testing"/>
<env name="DB_DATABASE" value="testing_db"/>
<!-- <env name="DB_CONNECTION" value="testing"/>
<env name="DB_DATABASE" value="testing_db"/> -->
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_CONNECTION" value="sync"/>
<env name="MAIL_MAILER" value="mail"/>
<env name="APP_URL" value="http://localhost:8000"/>
<env name="DB_DATABASE" value="testing_db"/>
<env name="DB_INSTALL" value="1"/>
</php>
</phpunit>

2
public/lb-faveo/css/app.3.0.css vendored
View File

@@ -779,7 +779,7 @@ ol.with-line-border > li {
-moz-box-sizing: content-box;
box-sizing: content-box;
left: 10%;
left: 3%;
}
.site-search .form-border {
width: 100%;

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

File diff suppressed because one or more lines are too long

8
resources/views/auth/login.blade.php
View File

@@ -53,7 +53,7 @@
@else
<span onclick="javascript: window.location.href='{{url('auth/register')}}';">
<a href="{{url('auth/register')}}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/register.png') }})" >
<span class="widgetitemtitle">{!! Lang::get('lang.register') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.register') !!}</span>
</a>
</span>
@endif
@@ -64,7 +64,7 @@
@if($system->status == 1)
<span onclick="javascript: window.location.href='{!! URL::route('form') !!}';">
<a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/submitticket.png') }})">
<div style="font-size: 13px" class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</div>
<div style="font-size: 13px ; color: rgb(0, 154, 186)"" class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</div>
</a>
</span>
@endif
@@ -72,12 +72,12 @@
@endif
<span onclick="javascript: window.location.href='{{url('mytickets')}}';">
<a href="{{url('mytickets')}}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/news.png') }})">
<span class="widgetitemtitle">{!! Lang::get('lang.my_tickets') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.my_tickets') !!}</span>
</a>
</span>
<span onclick="javascript: window.location.href='{{url('/knowledgebase')}}';">
<a href="{{url('/knowledgebase')}}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/knowledgebase.png') }})">
<span class="widgetitemtitle">{!! Lang::get('lang.knowledge_base') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.knowledge_base') !!}</span>
</a>
</span>
</div>

8
resources/views/auth/register.blade.php
View File

@@ -51,7 +51,7 @@
@else
<span onclick="javascript: window.location.href='{{url('auth/login')}}';">
<a href="{{url('auth/login')}}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/register.png') }})">
<span class="widgetitemtitle">{!! Lang::get('lang.login') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.login') !!}</span>
</a>
</span>
@endif
@@ -62,7 +62,7 @@
@if($system->status == 1)
<span onclick="javascript: window.location.href='{!! URL::route('form') !!}';">
<a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/submitticket.png') }})">
<span class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.submit_a_ticket') !!}</span>
</a>
</span>
@endif
@@ -70,12 +70,12 @@
@endif
<span onclick="javascript: window.location.href='{{url('mytickets')}}';">
<a href="{{url('mytickets')}}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/news.png') }})">
<span class="widgetitemtitle">{!! Lang::get('lang.my_tickets') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.my_tickets') !!}</span>
</a>
</span>
<span onclick="javascript: window.location.href='{{url('/knowledgebase')}}';">
<a href="{{url('/knowledgebase')}}" class="widgetrowitem defaultwidget" style="background-image:url({{ URL::asset('lb-faveo/media/images/knowledgebase.png') }})">
<span class="widgetitemtitle">{!! Lang::get('lang.knowledge_base') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.knowledge_base') !!}</span>
</a>
</span>
</div>

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

@@ -137,22 +137,27 @@ if ($thread->title != "") {
if ($group->can_edit_ticket == 1) {
?>
<button type="button" class="btn btn-sm btn-default btn-tool" id="Edit_Ticket" data-toggle="modal" data-target="#Edit"><i class="fas fa-edit" style="color:green;"> </i> {!! Lang::get('lang.edit') !!}</button>
<?php } ?>
<button type="button" class="btn btn-sm btn-default btn-tool">
<i class="fas fa-edit" style="color:green;"></i> Edit
</button> <?php } ?>
<?php if ($group->can_assign_ticket == 1) { ?>
<button type="button" class="btn btn-sm btn-default btn-tool" data-toggle="modal" data-target="#assign{{$tickets->id}}"><i class="fas fa-hand-point-right" style="color:orange;"> </i> {!! Lang::get('lang.assign') !!}</button>
<?php } ?>
<button type="button" class="btn btn-sm btn-default btn-tool">
<i class="fas fa-hand-point-right" style="color:orange;"></i> 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> {!! Lang::get('lang.surrender') !!}</button>
<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
</button>
@endif
<?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> {!! Lang::get('lang.generate_pdf') !!}</a>
<div class="btn-group">
<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
</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>
</button>

1
resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
View File

@@ -378,6 +378,7 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
}, 0);
</script>
@else
<div class="reply">{!! $conversation->purify(true) !!}</div>
@endif

4
resources/views/themes/default1/client/helpdesk/form.blade.php
View File

@@ -57,7 +57,7 @@ class = "nav-item active"
{!! Form::text('email_address',null,['class' => 'form-control form-group']) !!}
{!! Form::label('ticket_number',Lang::get('lang.ticket_number')) !!}<span class="text-red"> *</span>
{!! Form::text('ticket_number',null,['class' => 'form-control form-group']) !!}
<button type="submit" class="btn btn-info" style=" background-color: #337ab7 !important; border-color: #337ab7 !important; color: white">
<button type="submit" class="btn btn-info" style=" border-color: rgb(0, 192, 239); background-color: rgb(0, 154, 186) !important; color: white">
<i class="fas fa-save"></i> {!! Lang::get('lang.check_ticket_status') !!}
</button>
{!! Form::close() !!}
@@ -226,7 +226,7 @@ class = "nav-item active"
<div class="col-md-12" id="response"> </div>
<div id="ss" class="xs-md-6 form-group {{ $errors->has('') ? 'has-error' : '' }}"> </div>
<div class="col-md-12 form-group">
{!! Form::button('<i class="fas fa-save"></i> ' . Lang::get('lang.submit'), ['type'=>'submit', 'class'=>'btn btn-info float-right', 'style'=>'background-color: #337ab7 !important; border-color: #337ab7 !important; color: white;', 'onclick' => 'this.disabled=true;this.innerHTML="Sending, please wait...";this.form.submit();', 'data-v-fce8d630']) !!}
{!! Form::button('<i class="fas fa-save"></i> ' . Lang::get('lang.submit'), ['type'=>'submit', 'class'=>'btn btn-info float-right', 'style'=>'style="border-color: rgb(0, 192, 239); background-color: rgb(0, 154, 186); color: white;', 'onclick' => 'this.disabled=true;this.innerHTML="Sending, please wait...";this.form.submit();', 'data-v-fce8d630']) !!}
</div>
<div class="col-md-12" id="response"> </div>
<div id="ss" class="xs-md-6 form-group {{ $errors->has('') ? 'has-error' : '' }}"> </div>

8
resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
View File

@@ -43,7 +43,7 @@
@else
<span onclick="javascript: window.location.href='{{url('auth/register')}}';">
<a href="{{url('auth/register')}}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/register.png');">
<span class="widgetitemtitle">{!! Lang::get('lang.register') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.register') !!}</span>
</a>
</span>
@endif
@@ -54,7 +54,7 @@
@if($system->status == 1)
<span onclick="javascript: window.location.href='{!! URL::route('form') !!}';">
<a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/submitticket.png');">
<span class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.submit_a_ticket') !!}</span>
</a>
</span>
@endif
@@ -62,12 +62,12 @@
@endif
<span onclick="javascript: window.location.href='{{url('mytickets')}}';">
<a href="{{url('mytickets')}}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/news.png');">
<span class="widgetitemtitle">{!! Lang::get('lang.my_tickets') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.my_tickets') !!}</span>
</a>
</span>
<span onclick="javascript: window.location.href='{{url('/knowledgebase')}}';">
<a href="{{url('/knowledgebase')}}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/knowledgebase.png');">
<span class="widgetitemtitle">{!! Lang::get('lang.knowledge_base') !!}</span>
<span class="widgetitemtitle" style="color: rgb(0, 154, 186)">{!! Lang::get('lang.knowledge_base') !!}</span>
</a>
</span>
</div>

11
resources/views/themes/default1/client/kb/article-list/show.blade.php
View File

@@ -229,17 +229,20 @@ $category_id = $all->pluck('category_id')->toArray();
{!! $errors->first('website', '<span class="help-block">:message</span>') !!}
</div>
<button type="submit" class="btn btn-custom btn-lg" style="background-color: #009aba; hov: #00c0ef; color: #fff">{!! Lang::get('lang.post_message') !!}</button>
</div>
<div class="col-md-8">
<div class="col-md-10" style="width: 65%">
<div class="form-group {{ $errors->has('comment') ? 'has-error' : '' }}">
{!! Form::label('comment',Lang::get('lang.message'),['class' => 'label']) !!}
{!! Form::textarea('comment', null, ['class' => 'form-control', 'size' => '30x8', 'id' => 'comment-comment']) !!}
{!! $errors->first('comment', '<span class="help-block">:message</span>') !!}
{!! Form::textarea('comment',null,['class' => 'form-control','size' => '30x8','id'=>'comment']) !!}
{!! $errors->first('comment', '<spam class="help-block">:message</spam>') !!}
</div>
<button type="submit" class="btn btn-custom btn-lg float-right" style="background-color: #009aba; hov: #00c0ef; color: #fff">
{{ Lang::get('lang.post_message') }}
</button>
</div>
</div>
<script>
$(document).ready(function() {

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

@@ -132,7 +132,7 @@
</a>
</div>
<button class="navbar-toggler custom-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
<button class="navbar-toggler custom-toggler" onclick="javascript:(function() { jQuery('#navbarSupportedContent').toggle(); })()" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@@ -310,17 +310,17 @@
</div>
</nav>
<div id="header-search" class="site-search clearfix" style="margin-right: 20%; width: 100%"><!-- #header-search -->
<div id="header-search" class="site-search clearfix" style="margin-right: 90%; width: 100%"><!-- #header-search -->
{!!Form::open(['route' => 'client.search','class'=>'search-form clearfix'])!!}
<div class="form-border" style="z-index: 0;width: 85%;">
<div class="form-border" style="z-index: 0;width: 95%;">
<div class="form-inline">
<div class="form-group input-group " style="width: 98% ">
<input type="text" name="s" class="search-field form-control" title="Enter search term" placeholder="Have a question? Type your search term here..." required="" style="width: 80%">
<div class="form-group input-group" style="width: 100%;">
<input type="text" name="s" class="search-field form-control input-lg mr-3" title="Enter search term" placeholder="Have a question? Type your search term here..." required>
<span class="input-group-btn">
<button type="submit" class="btn btn-custom btn-md " style="margin-left: 20% ;background-color: #009aba; hov: #00c0ef; color: #fff ">Search</button>
<button type="submit" class="btn btn-custom btn-md" style="border-color: rgb(0, 192, 239); background-color: rgb(0, 154, 186);">Search</button>
</span>
</div>
</div><!----><!----></div>
<style>
.search-field {
border-radius: 10px; /* You can adjust the value to your desired radius */

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

@@ -118,7 +118,7 @@
</a>
</div>
<button class="navbar-toggler custom-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
<button class="navbar-toggler custom-toggler"onclick="javascript:(function() { jQuery('#navbarSupportedContent').toggle(); })()" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@@ -206,15 +206,14 @@
</ul>
</div>
</nav>
<div id="header-search" class="site-search clearfix" style="margin-right: 20%; width: 100%"><!-- #header-search -->
<div id="header-search" class="site-search clearfix" style="margin-right: 90%; width: 100%"><!-- #header-search -->
{!!Form::open(['route' => 'client.search','class'=>'search-form clearfix'])!!}
<div class="form-border" style="z-index: 0;width: 85%;">
<div class="form-border" style="z-index: 0;width: 95%;">
<div class="form-inline">
<div class="form-group input-group " style="width: 98% ">
<input type="text" name="s" class="search-field form-control" title="Enter search term" placeholder="Have a question? Type your search term here..." required="" style="width: 80%">
<div class="form-group input-group" style="width: 100%;">
<input type="text" name="s" class="search-field form-control input-lg mr-3" title="Enter search term" placeholder="Have a question? Type your search term here..." required>
<span class="input-group-btn">
<button type="submit" class="btn btn-custom btn-md " style="margin-left: 20% ;background-color: #009aba; hov: #00c0ef; color: #fff ">Search</button>
<button type="submit" class="btn btn-custom btn-md" style="border-color: rgb(0, 192, 239); background-color: rgb(0, 154, 186);">Search</button>
</span>
</div>