merge develop with remove_deleted_user_from_unaccepted_assets_report

.all-contributorsrc

@@ -2306,6 +2306,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "JohnnyPicnic",
+      "name": "JohnnyPicnic",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5553884?v=4",
+      "profile": "https://github.com/JohnnyPicnic",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "markbrule",
+      "name": "markbrule",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8799594?v=4",
+      "profile": "https://github.com/markbrule",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mikecmpbll",
+      "name": "Mike Campbell",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1962801?v=4",
+      "profile": "https://github.com/mikecmpbll",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.env.example

@@ -77,7 +77,7 @@ ENCRYPT=false
 COOKIE_NAME=snipeit_session
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
-API_TOKEN_EXPIRATION_YEARS=40
+API_TOKEN_EXPIRATION_YEARS=15
 
 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS

Dockerfile.alpine

@@ -57,7 +57,7 @@ RUN \
     && mkdir -p "/var/lib/snipeit/dumps" && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
     && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
     && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
-    && chown -h "/var/www/html/storage/*.key"
+    && chown -hR apache "/var/www/html/storage/" \
     && chown -R apache "/var/lib/snipeit"
 
 # Install composer

README.md

@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-253-orange.svg?style=flat-square)](#contributors) 
+[![All Contributors](https://img.shields.io/badge/all_contributors-256-orange.svg?style=flat-square)](#contributors) 
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -125,7 +125,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Http/Controllers/Api/AccessoriesController.php

@@ -287,7 +287,7 @@ class AccessoriesController extends Controller
         $accessory = Accessory::find($accessory_user->accessory_id);
         $this->authorize('checkin', $accessory);
 
-        $logaction = $accessory->logCheckin(User::find($accessoryUserId), $request->input('note'));
+        $logaction = $accessory->logCheckin(User::find($accessory_user->user_id), $request->input('note'));
 
         // Was the accessory updated?
         if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {

app/Http/Controllers/Assets/AssetFilesController.php

@@ -110,15 +110,15 @@ class AssetFilesController extends Controller
     {
         $asset = Asset::find($assetId);
         $this->authorize('update', $asset);
-        $rel_path = 'storage/private_uploads/assets';
+        $rel_path = 'private_uploads/assets';
 
         // the asset is valid
         if (isset($asset->id)) {
             $this->authorize('update', $asset);
             $log = Actionlog::find($fileId);
             if ($log) {
-            if (file_exists(base_path().'/'.$rel_path.'/'.$log->filename)) {
-                Storage::disk('public')->delete($rel_path.'/'.$log->filename);
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
                 }
                 $log->delete();
                 return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));

app/Http/Controllers/Assets/AssetsController.php

@@ -813,7 +813,7 @@ class AssetsController extends Controller
         $asset->unsetEventDispatcher();
 
         $asset->next_audit_date = $request->input('next_audit_date');
-        $asset->last_audit_date = date('Y-m-d h:i:s');
+        $asset->last_audit_date = date('Y-m-d H:i:s');
 
         // Check to see if they checked the box to update the physical location,
         // not just note it in the audit notes

app/Http/Controllers/LocationsController.php

@@ -6,6 +6,7 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Location;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
+use App\Models\Asset;
 use Illuminate\Support\Facades\Storage;
 
 /**

app/Http/Controllers/ReportsController.php

@@ -416,7 +416,7 @@ class ReportsController extends Controller
             // Open output stream
             $handle = fopen('php://output', 'w');
             stream_set_timeout($handle, 2000);
-
+            
             if ($request->filled('use_bom')) {
                 fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF));
             }
@@ -487,7 +487,7 @@ class ReportsController extends Controller
             if ($request->filled('rtd_location')) {
                 $header[] = trans('admin/hardware/form.default_location');
             }
-
+            
             if ($request->filled('rtd_location_address')) {
                 $header[] = trans('general.address');
                 $header[] = trans('general.address');
@@ -578,7 +578,7 @@ class ReportsController extends Controller
             $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with(
                 'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
                 'model.category', 'model.manufacturer','supplier');
-
+            
             if ($request->filled('by_location_id')) {
                 $assets->where('assets.location_id', $request->input('by_location_id'));
             }
@@ -640,8 +640,8 @@ class ReportsController extends Controller
             if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                 $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
             }
-
-            $assets->orderBy('assets.created_at', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) {
+            
+            $assets->orderBy('assets.id', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) {
 
                 $executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"];
                 \Log::debug('Walking results: '.$executionTime);
@@ -649,7 +649,7 @@ class ReportsController extends Controller
                 foreach ($assets as $asset) {
                     $count++;
                     $row = [];
-
+                    
                     if ($request->filled('company')) {
                         $row[] = ($asset->company) ? $asset->company->name : '';
                     }
@@ -698,7 +698,7 @@ class ReportsController extends Controller
                     if ($request->filled('supplier')) {
                         $row[] = ($asset->supplier) ? $asset->supplier->name : '';
                     }
-
+                    
 
                     if ($request->filled('location')) {
                         $row[] = ($asset->location) ? $asset->location->present()->name() : '';
@@ -940,11 +940,11 @@ class ReportsController extends Controller
          * Get all assets with pending checkout acceptances
          */
 
-        $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get();
+        $acceptances = CheckoutAcceptance::pending()->get();
 
         $assetsForReport = $acceptances
             ->filter(function($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo);
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
             })
             ->map(function($acceptance) {
                 return $acceptance->checkoutable;

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v5.1.5',
-  'full_app_version' => 'v5.1.5 - build 6029-gb8c356443',
-  'build_version' => '6029',
+  'full_app_version' => 'v5.1.5 - build 6055-gd9d5b4d73',
+  'build_version' => '6055',
   'prerelease_version' => '',
-  'hash_version' => 'gb8c356443',
-  'full_hash' => 'v5.1.5-125-gb8c356443',
+  'hash_version' => 'gd9d5b4d73',
+  'full_hash' => 'v5.1.5-17-gd9d5b4d73',
   'branch' => 'develop',
 );

public/mix-manifest.json

@@ -3,21 +3,21 @@
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5d8ce6b758f170008cd6",
     "/css/build/app.css": "/css/build/app.css?id=9b6ddbece1a3cfc99036",
     "/css/build/overrides.css": "/css/build/overrides.css?id=0a65220cdae6fbb6d913",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a5c05d669800b5f5afa1",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=1d5974e034b61b5795ec",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=76d0cc15e24e6a03fd2f",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=6843dc80c6b201c4a7db",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=d3c953fe66305cef3b54",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=97d81897063e94094a2a",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=679ab6aeba9c278a9051",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=56d008e86c006d37bc23",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=915206c9df022fc5037a",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=2b17e31c820ef66db5a1",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ccdd91178df4c10811e9",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=928bfe8035be1497e83b",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=539f691ddc970f867c49",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=4bf9e22405edb2dc2b76",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=e57a7bb77ae1fb640331",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=fdb6630b38435c84c7d2",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=5d582ce5e98f591b8c65",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=02e8563844e00840e01c",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=4daaa0e353849ff8cacf",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c89047b28b272bc07e81",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=9f9013a3ec06e256e1dc",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=5b4937fd36d26f7a92e3",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=e6239abc2a7a28441911",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=85ef26204fbc8b2dad5b",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=84667fc9b0f00d11a9c4",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=8e774a0e5435527d63c4",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=5269656828cfba157e92",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0a4ddc28e3a8228cc11e",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b22dc3561eda3d2027a9",
     "/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b",
     "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
     "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
@@ -27,19 +27,19 @@
     "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=fd6e727609678bf04984",
     "/js/dist/all.js": "/js/dist/all.js?id=d0fbb4953b84b70787d4",
-    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=76d0cc15e24e6a03fd2f",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6843dc80c6b201c4a7db",
-    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=d3c953fe66305cef3b54",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=97d81897063e94094a2a",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=a5c05d669800b5f5afa1",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=928bfe8035be1497e83b",
-    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=2b17e31c820ef66db5a1",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ccdd91178df4c10811e9",
-    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=1d5974e034b61b5795ec",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=679ab6aeba9c278a9051",
-    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=56d008e86c006d37bc23",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=915206c9df022fc5037a",
-    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=4bf9e22405edb2dc2b76",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=539f691ddc970f867c49",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a"
+    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=02e8563844e00840e01c",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=4daaa0e353849ff8cacf",
+    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c89047b28b272bc07e81",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=9f9013a3ec06e256e1dc",
+    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=e57a7bb77ae1fb640331",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=5269656828cfba157e92",
+    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=84667fc9b0f00d11a9c4",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=8e774a0e5435527d63c4",
+    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=fdb6630b38435c84c7d2",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=5b4937fd36d26f7a92e3",
+    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=e6239abc2a7a28441911",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=85ef26204fbc8b2dad5b",
+    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=b22dc3561eda3d2027a9",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=0a4ddc28e3a8228cc11e",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=5d582ce5e98f591b8c65"
 }

resources/assets/less/skins/skin-black-dark.less

@@ -403,3 +403,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-black.less

@@ -108,4 +108,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @black;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }

resources/assets/less/skins/skin-blue-dark.less

@@ -392,3 +392,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-blue.less

@@ -120,4 +120,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: #3c8dbc;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }

resources/assets/less/skins/skin-contrast.less

@@ -168,4 +168,8 @@ input::-ms-input-placeholder { /* IE 10+ */
 
 .fixed-table-container tbody .selected td {
   background-color: #fff8af;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }

resources/assets/less/skins/skin-green-dark.less

@@ -392,3 +392,7 @@ a {
   display: table-cell;
 }
 
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-green.less

@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @green;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }

resources/assets/less/skins/skin-orange-dark.less

@@ -394,3 +394,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-orange.less

@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @orange;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }

resources/assets/less/skins/skin-purple-dark.less

@@ -394,3 +394,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-purple.less

@@ -108,3 +108,6 @@ a {
   background-color: @purple;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-red-dark.less

@@ -393,3 +393,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-red.less

@@ -105,4 +105,8 @@ a {
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @red;
+}
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
 }

resources/assets/less/skins/skin-yellow-dark.less

@@ -391,3 +391,6 @@ a {
   display: table-cell;
 }
 
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/assets/less/skins/skin-yellow.less

@@ -106,3 +106,7 @@ a {
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @yellow;
 }
+
+.search-highlight, .search-highlight:hover {
+  background-color: #e9d15b;
+}

resources/views/partials/bootstrap-table.blade.php

@@ -1,13 +1,15 @@
 @push('css')
 <link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
+
 @endpush
 
 @push('js')
-<script src="{{ asset(mix('js/dist/bootstrap-table.js')) }}"></script>
+<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
 <script nonce="{{ csrf_token() }}">
 
     $(function () {
 
+
         var stickyHeaderOffsetY = 0;
 
         if ( $('.navbar-fixed-top').css('height') ) {
@@ -21,7 +23,7 @@
 
         var keyBlocked = function(key) {
             for(var j in blockedFields) {
-                if(key === blockedFields[j]) {
+                if (key === blockedFields[j]) {
                     return true;
                 }
             }
@@ -44,6 +46,7 @@
             mobileResponsive: true,
             maintainSelected: true,
             trimOnSearch: false,
+            showSearchClearButton: true,
             paginationFirstText: "{{ trans('general.first') }}",
             paginationLastText: "{{ trans('general.last') }}",
             paginationPreText: "{{ trans('general.previous') }}",
@@ -69,12 +72,14 @@
                 paginationSwitchUp: 'fa-caret-square-o-up',
                 columns: 'fa-columns',
                 refresh: 'fa-refresh',
-                export: 'fa-download'
+                export: 'fa-download',
+                clearSearch: 'fa-times'
             },
             exportTypes: ['csv', 'excel', 'doc', 'txt','json', 'xml', 'pdf'],
             onLoadSuccess: function () {
-                $('[data-toggle="tooltip"]').tooltip(); // Need to attach tooltips after ajax call
+                $('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
             }
+
         });
     });
 
@@ -621,13 +626,37 @@
     });
 
 
-    // This is necessary to make the bootstrap tooltips work inside of the
-    // wenzhixin/bootstrap-table formatters
+
     $(function() {
+
+        // This handles the search box highlighting on both ajax and client-side
+        // bootstrap tables
+        var searchboxHighlighter = function (event) {
+
+            $('.search-input').each(function (index, element) {
+
+                if ($(element).val() != '') {
+                    $(element).addClass('search-highlight');
+                    $(element).next().children().addClass('search-highlight');
+                } else {
+                    $(element).removeClass('search-highlight');
+                    $(element).next().children().removeClass('search-highlight');
+                }
+            });
+        };
+
+        $('.search button[name=clearSearch]').click(searchboxHighlighter);
+        searchboxHighlighter({ name:'pageload'});
+        $('.search-input').keyup(searchboxHighlighter);
+
+        //  This is necessary to make the bootstrap tooltips work inside of the
+        // wenzhixin/bootstrap-table formatters
         $('#table').on('post-body.bs.table', function () {
             $('[data-toggle="tooltip"]').tooltip({
                 container: 'body'
             });
+
+
         });
     });