Merge branch 'development' into pr-8202

ladybirdweb · Oct 11, 2023 · 431dd05 · 431dd05
2 parents 846ee90 + aa4b3d2
commit 431dd05
Show file tree

Hide file tree

Showing 13 changed files with 450 additions and 451 deletions.
diff --git a/app/Api/routes.php b/app/Api/routes.php
@@ -63,7 +63,7 @@
     /*
      * FCM token response
      */
-    Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken');
+    //Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken');
 });
 /*
  * ================================================================================================

diff --git a/phpunit.xml b/phpunit.xml
@@ -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">
-    <testsuites>
-        <testsuite name="all">
-            <directory>./tests/</directory>
-        </testsuite>
-        <testsuite name="unit">
-            <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="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 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="feature">
+      <directory>tests/Feature</directory>
+    </testsuite>
+    <testsuite name="unit">
+      <directory>tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+   <!-- <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_INSTALL" value="1"/>
+  </php>
 </phpunit>
diff --git a/public/lb-faveo/css/app.3.0.css b/public/lb-faveo/css/app.3.0.css
@@ -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%;

diff --git a/public/lb-faveo/css/bootstrap5.min.css b/public/lb-faveo/css/bootstrap5.min.css
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -52,8 +52,8 @@ class = "nav-item active"
                 @if(Auth::user())
                 @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>
+                    <a href="{{url('auth/register')}}"  class="widgetrowitem defaultwidget"  style="background-image:url({{ URL::asset('lb-faveo/media/images/register.png') }})"  >
+                        <span class="widgetitemtitle"  style="color: rgb(0, 154, 186)">{!! Lang::get('lang.register') !!}</span>
                     </a>
                 </span>
                 @endif
@@ -64,20 +64,20 @@ class = "nav-item active"
                         @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
                     @endif
                 @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>

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -51,7 +51,7 @@ class = "nav-item active"
         @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,20 +62,20 @@ class = "nav-item active"
                 @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
             @endif
         @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>

diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -138,28 +138,33 @@ class="nav-link active"
 
             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>
                 <div class="dropdown-menu">
                     <a href="#" id="open" class="dropdown-item"><i class="fas fa-folder-open" style="color:red;"> </i> {!! Lang::get('lang.open') !!}</a>
-                   
+
                     <?php if ( $tickets_approval->status==7) {?>
                   @if(Auth::user()->role == 'admin')
                      <a href="#" id="approval_close" class="dropdown-item"><i class="fas fa-thumbs-up" style="color:red;"> </i> {!! Lang::get('lang.approval') !!}</a>

diff --git a/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php b/resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
@@ -378,6 +378,7 @@
                                         }, 0);
                                     </script>
                                 @else
+                                    <div class="reply">{!! $conversation->purify(true) !!}</div>
                                 @endif
 
 

diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php
@@ -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>

diff --git a/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php b/resources/views/themes/default1/client/helpdesk/guest-user/index.blade.php
@@ -43,7 +43,7 @@ class = "nav-item active"
         @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,20 +54,20 @@ class = "nav-item active"
                 @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
             @endif
         @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>

diff --git a/resources/views/themes/default1/client/kb/article-list/show.blade.php b/resources/views/themes/default1/client/kb/article-list/show.blade.php
@@ -229,17 +229,20 @@ function submitComment(userId, comment) {
                                 {!! $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::label('comment',Lang::get('lang.message'),['class' => 'label']) !!}
+                                {!! 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() {

diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php
@@ -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,7 +310,7 @@
                         </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-inline ">
@@ -320,7 +320,7 @@
                                         <button type="submit" class="btn btn-custom btn-md " style="margin-left: 20% ;background-color: #009aba; hov: #00c0ef; color: #fff ">{{trans('lang.search')}}</button>
                                     </span>
                                 </div>
-
+                            </div><!----><!----></div>
                                 <style>
                                     .search-field {
                                         border-radius: 10px; /* You can adjust the value to your desired radius */
-Original file line number
+Diff line change
@@ Expand Up / @@ -378,6 +378,7 @@ @@
                                             }, 0);
                                         </script>
                                     @else
+                                        <div class="reply">{!! $conversation->purify(true) !!}</div>
                                     @endif
@@ Expand Down @@