changes

phpunit.xml

@@ -13,7 +13,7 @@
             <directory>./tests/</directory>
         </testsuite>
         <testsuite name="unit">
-            <directory>./tests/Unit</directory>
+            <directory>./tests/unit</directory>
         </testsuite>
     </testsuites>
     <filter>
@@ -23,14 +23,14 @@
     </filter>
     <php>
         <env name="APP_ENV" value="testing"/>
-<!--        <env name="DB_CONNECTION" value="testing"/>-->
+        <env name="DB_CONNECTION" value="testing"/>
-<!--        <env name="DB_DATABASE" value="testing_db"/>-->
+        <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_DATABASE" value="testing_db"/>
         <env name="DB_INSTALL" value="1"/>
     </php>
 </phpunit>

resources/views/auth/login.blade.php

@@ -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>

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

@@ -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>
+            <button type="button" class="btn btn-sm btn-default btn-tool">
-            <?php } ?>
+                <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>
+            <button type="button" class="btn btn-sm btn-default btn-tool">
-            <?php } ?>
+                <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>
+            <a href="{{url('ticket/print/'.$tickets->id)}}" target="_blank" class="btn btn-default btn-tool btn-sm">
-            <div class="btn-group">
+                <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>

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

@@ -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']) !!}
+                                {!! Form::textarea('comment',null,['class' => 'form-control','size' => '30x8','id'=>'comment']) !!}
-                                {!! $errors->first('comment', '<span class="help-block">:message</span>') !!}
+                                {!! $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() {

resources/views/themes/default1/client/layout/logclient.blade.php

@@ -206,7 +206,6 @@
                     </ul>
                 </div>
             </nav>
-
             <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: 95%;">
@@ -217,7 +216,6 @@
                                         <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 {
@@ -226,6 +224,7 @@
                         </style>
                     </div>
                 </div>
+                {!! Form::close() !!}
 
             </div>
     </header>

routes/web.php

@@ -365,7 +365,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');