Updated field name

Signed-off-by: snipe <snipe@snipe.net>

.all-contributorsrc

@@ -3217,15 +3217,6 @@
       "contributions": [
         "bug"
       ]
-    },
-    {
-      "login": "DarrenRainey",
-      "name": "Darren Rainey",
-      "avatar_url": "https://avatars.githubusercontent.com/u/6136439?v=4",
-      "profile": "https://darrenraineys.co.uk",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }

CONTRIBUTORS.md

@@ -52,7 +52,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") | [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") | [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") |
 | [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") | [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Console/Commands/LdapSync.php

@@ -2,7 +2,6 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Asset;
 use App\Models\Department;
 use App\Models\Group;
 use Illuminate\Console\Command;
@@ -419,8 +418,6 @@ class LdapSync extends Command
                 if ($item['createorupdate'] === 'created' && $ldap_default_group) {
                     $user->groups()->attach($ldap_default_group);
                 }
-                //updates assets location based on user's location
-                Asset::where('assigned_to', '=', $user->id)->update(['location_id' => $user->location_id]);
 
             } else {
                 foreach ($user->getErrors()->getMessages() as $key => $err) {

app/Helpers/Helper.php

@@ -16,7 +16,6 @@ use Illuminate\Support\Facades\Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
 use Illuminate\Support\Facades\Session;
 
@@ -554,7 +553,7 @@ class Helper
      */
     public static function statusLabelList()
     {
-        $statuslabel_list = ['' => trans('general.select_statuslabel')] + Statuslabel::orderBy('default_label', 'desc')->orderBy('name', 'asc')->orderBy('deployable', 'desc')
+        $statuslabel_list = ['' => trans('general.select_statuslabel')] + Statuslabel::orderBy('default_label', 'desc')->orderBy('name', 'asc')->orderBy('status_type', 'desc')
                 ->pluck('name', 'id')->toArray();
 
         return $statuslabel_list;
@@ -573,9 +572,9 @@ class Helper
      */
     public static function deployableStatusLabelList()
     {
-        $statuslabel_list = Statuslabel::where('deployable', '=', '1')->orderBy('default_label', 'desc')
+        $statuslabel_list = Statuslabel::where('status_type', 'deployable')->orderBy('default_label', 'desc')
                 ->orderBy('name', 'asc')
-                ->orderBy('deployable', 'desc')
+                ->orderBy('status_type', 'desc')
                 ->pluck('name', 'id')->toArray();
 
         return $statuslabel_list;
@@ -709,28 +708,6 @@ class Helper
 
         return $randomString;
     }
-    /**
-     * A method to be used to handle deprecations notifications, currently handling MS Teams. more can be added when needed.
-     *
-     *
-     * @author [Godfrey Martinez]
-     * @since [v7.0.14]
-     * @return array
-     */
-    public static function deprecationCheck()  : array {
-        // The check and message that the user is still using the deprecated version
-        $deprecations = [
-            'ms_teams_deprecated' => array(
-            'check' => !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows'),
-            'message' => 'The Microsoft Teams webhook URL being used will be deprecated Jan 31st, 2025. <a class="btn btn-primary" href="' . route('settings.slack.index') . '">Change webhook endpoint</a>'),
-        ];
-
-        // if item of concern is being used and its being used with the deprecated values return the notification array.
-        if(Setting::getSettings()->webhook_selected === 'microsoft' && $deprecations['ms_teams_deprecated']['check']) {
-            return $deprecations;
-        }
-            return [];
-    }
 
     /**
      * This nasty little method gets the low inventory info for the

app/Http/Controllers/Account/AcceptanceController.php

@@ -338,5 +338,4 @@ class AcceptanceController extends Controller
         return redirect()->to('account/accept')->with('success', $return_msg);
 
     }
-
 }

app/Http/Controllers/ActionlogController.php

@@ -37,18 +37,10 @@ class ActionlogController extends Controller
         }
     }
 
-    public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
+    public function getStoredEula($filename) : Response | BinaryFileResponse
     {
         $this->authorize('view', \App\Models\Asset::class);
         $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
-
-        if (Storage::exists($file)) {
-            return response()->download($file);
-        }
-
-        return redirect()->back()->with('error',  trans('general.file_does_not_exist'));
-
-
-
+        return response()->download($file);
     }
 }

app/Http/Controllers/Api/AssetModelsController.php

@@ -59,7 +59,6 @@ class AssetModelsController extends Controller
             'model_number',
             'min_amt',
             'eol',
-            'created_by',
             'requestable',
             'models.notes',
             'models.created_at',
@@ -70,7 +69,7 @@ class AssetModelsController extends Controller
             'models.deleted_at',
             'models.updated_at',
          ])
-            ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
+            ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues','adminuser')
             ->withCount('assets as assets_count');
 
         if ($request->input('status')=='deleted') {
@@ -96,7 +95,7 @@ class AssetModelsController extends Controller
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at';
 
-        switch ($request->input('sort')) {
+        switch ($sort) {
             case 'manufacturer':
                 $assetmodels->OrderManufacturer($order);
                 break;
@@ -106,9 +105,6 @@ class AssetModelsController extends Controller
             case 'fieldset':
                 $assetmodels->OrderFieldset($order);
                 break;
-            case 'created_by':
-                $assetmodels->OrderByCreatedByName($order);
-                break;
             default:
                 $assetmodels->orderBy($sort, $order);
                 break;

app/Http/Controllers/Api/AssetsController.php

@@ -61,7 +61,7 @@ class AssetsController extends Controller
         if ($action == 'audit') {
             $action = 'audits';
         }
-        $filter_non_deprecable_assets = false;
+        $filter_non_depreciable_assets = false;
 
         /**
          * This looks MAD janky (and it is), but the AssetsController@index does a LOT of heavy lifting throughout the 
@@ -75,7 +75,7 @@ class AssetsController extends Controller
          * which would have been far worse of a mess. *sad face*  - snipe (Sept 1, 2021)
          */
         if (Route::currentRouteName()=='api.depreciation-report.index') {
-            $filter_non_deprecable_assets = true;
+            $filter_non_depreciable_assets = true;
             $transformer = 'App\Http\Transformers\DepreciationReportTransformer';
             $this->authorize('reports.view');
         } else {
@@ -130,9 +130,9 @@ class AssetsController extends Controller
                 'model.category', 'model.manufacturer', 'model.fieldset','supplier'); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
 
 
-        if ($filter_non_deprecable_assets) {
-            $non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
-            $assets->InModelList($non_deprecable_models->toArray());
+        if ($filter_non_depreciable_assets) {
+            $non_depreciable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
+            $assets->InModelList($non_depreciable_models->toArray());
         }
 
 
@@ -206,18 +206,14 @@ class AssetsController extends Controller
             case 'Pending':
                 $assets->join('status_labels AS status_alias', function ($join) {
                     $join->on('status_alias.id', '=', 'assets.status_id')
-                        ->where('status_alias.deployable', '=', 0)
-                        ->where('status_alias.pending', '=', 1)
-                        ->where('status_alias.archived', '=', 0);
+                        ->where('status_alias.status_type', '=', 'pending');
                 });
                 break;
             case 'RTD':
                 $assets->whereNull('assets.assigned_to')
                     ->join('status_labels AS status_alias', function ($join) {
                         $join->on('status_alias.id', '=', 'assets.status_id')
-                            ->where('status_alias.deployable', '=', 1)
-                            ->where('status_alias.pending', '=', 0)
-                            ->where('status_alias.archived', '=', 0);
+                            ->where('status_alias.status_type', '=', 'deployable');
                     });
                 break;
             case 'Undeployable':
@@ -226,20 +222,15 @@ class AssetsController extends Controller
             case 'Archived':
                 $assets->join('status_labels AS status_alias', function ($join) {
                     $join->on('status_alias.id', '=', 'assets.status_id')
-                        ->where('status_alias.deployable', '=', 0)
-                        ->where('status_alias.pending', '=', 0)
-                        ->where('status_alias.archived', '=', 1);
+                        ->where('status_alias.status_type', '=', 'archived');
                 });
                 break;
             case 'Requestable':
                 $assets->where('assets.requestable', '=', 1)
                     ->join('status_labels AS status_alias', function ($join) {
                         $join->on('status_alias.id', '=', 'assets.status_id')
-                            ->where('status_alias.deployable', '=', 1)
-                            ->where('status_alias.pending', '=', 0)
-                            ->where('status_alias.archived', '=', 0);
+                            ->where('status_alias.status_type', '=', 'deployable');
                     });
-
                 break;
             case 'Deployed':
                 // more sad, horrible workarounds for laravel bugs when doing full text searches
@@ -256,7 +247,7 @@ class AssetsController extends Controller
                     // terrible workaround for complex-query Laravel bug in fulltext
                     $assets->join('status_labels AS status_alias', function ($join) {
                         $join->on('status_alias.id', '=', 'assets.status_id')
-                            ->where('status_alias.archived', '=', 0);
+                            ->where('status_alias.status_type', '!=', 'archived');
                     });
 
                     // If there is a status ID, don't take show_archived_in_list into consideration
@@ -265,6 +256,7 @@ class AssetsController extends Controller
                         $join->on('status_alias.id', '=', 'assets.status_id');
                     });
                 }
+                break;
 
         }
 
@@ -574,8 +566,8 @@ class AssetsController extends Controller
             }
 
 
-            if ($asset->assetstatus->getStatuslabelType() == 'pending') {
-                $asset->use_text .= '('.$asset->assetstatus->getStatuslabelType().')';
+            if ($asset->assetstatus->status_label == 'pending') {
+                $asset->use_text .= '('.$asset->assetstatus->status_label.')';
             }
 
             $asset->use_image = ($asset->getImageUrl()) ? $asset->getImageUrl() : null;

app/Http/Controllers/Api/ImportController.php

@@ -28,7 +28,8 @@ class ImportController extends Controller
     public function index() : JsonResponse | array
     {
         $this->authorize('import');
-        $imports = Import::with('adminuser')->latest()->get();
+        $imports = Import::latest()->get();
+
         return (new ImportsTransformer)->transformImports($imports);
     }
 
@@ -132,7 +133,7 @@ class ImportController extends Controller
                 }
 
                 $import->filesize = filesize($path.'/'.$file_name);
-                $import->created_by = auth()->id();
+                
                 $import->save();
                 $results[] = $import;
             }
@@ -176,9 +177,6 @@ class ImportController extends Controller
             case 'asset':
                 $redirectTo = 'hardware.index';
                 break;
-            case 'assetModel':
-                $redirectTo = 'models.index';
-                break;
             case 'accessory':
                 $redirectTo = 'accessories.index';
                 break;

app/Http/Controllers/Api/ReportsController.php

@@ -44,6 +44,21 @@ class ReportsController extends Controller
             });
         }
 
+        if ($request->filled('action_type')) {
+            $actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type'))->orderBy('created_at', 'desc');
+        }
+
+        if ($request->filled('created_by')) {
+            $actionlogs = $actionlogs->where('created_by', '=', $request->input('created_by'));
+        }
+
+        if ($request->filled('action_source')) {
+            $actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source'))->orderBy('created_at', 'desc');
+        }
+
+        if ($request->filled('remote_ip')) {
+            $actionlogs = $actionlogs->where('remote_ip', '=', $request->input('remote_ip'))->orderBy('created_at', 'desc');
+        }
 
         if ($request->filled('uploads')) {
             $actionlogs = $actionlogs->whereNotNull('filename')->orderBy('created_at', 'desc');
@@ -59,8 +74,6 @@ class ReportsController extends Controller
             'note',
             'remote_ip',
             'user_agent',
-            'target_type',
-            'item_type',
             'action_source',
             'action_date',
         ];

app/Http/Controllers/Api/StatuslabelsController.php

@@ -32,7 +32,8 @@ class StatuslabelsController extends Controller
             'assets_count',
             'color',
             'notes',
-            'default_label'
+            'default_label',
+            'status_type',
         ];
 
         $statuslabels = Statuslabel::with('adminuser')->withCount('assets as assets_count');
@@ -49,13 +50,12 @@ class StatuslabelsController extends Controller
         // if a status_type is passed, filter by that
         if ($request->filled('status_type')) {
             if (strtolower($request->input('status_type')) == 'pending') {
-                $statuslabels = $statuslabels->Pending();
-            } elseif (strtolower($request->input('status_type')) == 'archived') {
-                $statuslabels = $statuslabels->Archived();
-            } elseif (strtolower($request->input('status_type')) == 'deployable') {
-                $statuslabels = $statuslabels->Deployable();
+                $statuslabels->where('status_type', '=', 'pending');
+            } elseif (strtolower($request->input('status_type')) == 'archived') $statuslabels->where('status_type', '=', 'archived');
+            elseif (strtolower($request->input('status_type')) == 'deployable') {
+                $statuslabels->where('status_type', '=', 'deployable');
             } elseif (strtolower($request->input('status_type')) == 'undeployable') {
-                $statuslabels = $statuslabels->Undeployable();
+                $statuslabels->whereNot('status_type', 'deployable');
             }
         }
 
@@ -92,20 +92,11 @@ class StatuslabelsController extends Controller
     public function store(Request $request) : JsonResponse
     {
         $this->authorize('create', Statuslabel::class);
-        $request->except('deployable', 'pending', 'archived');
 
-        if (! $request->filled('type')) {
-
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['type' => ['Status label type is required.']]));
-        }
 
         $statuslabel = new Statuslabel;
         $statuslabel->fill($request->all());
-
-        $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type'));
-        $statuslabel->deployable = $statusType['deployable'];
-        $statuslabel->pending = $statusType['pending'];
-        $statuslabel->archived = $statusType['archived'];
+        $statuslabel->status_type       =  $request->input('status_type');
         $statuslabel->color             =  $request->input('color');
         $statuslabel->show_in_nav       =  $request->input('show_in_nav', 0);
         $statuslabel->default_label     =  $request->input('default_label', 0);
@@ -146,20 +137,12 @@ class StatuslabelsController extends Controller
     {
         $this->authorize('update', Statuslabel::class);
         $statuslabel = Statuslabel::findOrFail($id);
-        
-        $request->except('deployable', 'pending', 'archived');
 
 
-        if (! $request->filled('type')) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Status label type is required.'));
-        }
-
         $statuslabel->fill($request->all());
 
         $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type'));
-        $statuslabel->deployable = $statusType['deployable'];
-        $statuslabel->pending = $statusType['pending'];
-        $statuslabel->archived = $statusType['archived'];
+        $statuslabel->status_type    =  $request->input('status_type');
         $statuslabel->color             =  $request->input('color');
         $statuslabel->show_in_nav       =  $request->input('show_in_nav', 0);
         $statuslabel->default_label     =  $request->input('default_label', 0);
@@ -207,7 +190,7 @@ class StatuslabelsController extends Controller
         $this->authorize('view', Statuslabel::class);
 
         if (Setting::getSettings()->show_archived_in_list == 0 ) {
-            $statuslabels = Statuslabel::withCount('assets')->where('archived','0')->get();
+            $statuslabels = Statuslabel::withCount('assets')->whereNot('status_type','archived')->get();
         } else {
             $statuslabels = Statuslabel::withCount('assets')->get();
         }
@@ -301,7 +284,7 @@ class StatuslabelsController extends Controller
     public function checkIfDeployable($id) : string
     {
         $statuslabel = Statuslabel::findOrFail($id);
-        if ($statuslabel->getStatuslabelType() == 'deployable') {
+        if ($statuslabel->status_type == 'deployable') {
             return '1';
         }
 
@@ -319,22 +302,22 @@ class StatuslabelsController extends Controller
     {
 
         $this->authorize('view.selectlists');
-        $statuslabels = Statuslabel::orderBy('default_label', 'desc')->orderBy('name', 'asc')->orderBy('deployable', 'desc');
+        $statuslabels = Statuslabel::orderBy('default_label', 'desc')->orderBy('name', 'asc')->orderBy('status_type', 'desc');
 
         if ($request->filled('search')) {
             $statuslabels = $statuslabels->where('name', 'LIKE', '%'.$request->get('search').'%');
         }
 
         if ($request->filled('deployable')) {
-            $statuslabels = $statuslabels->where('deployable', '=', '1');
+            $statuslabels = $statuslabels->where('status_type', '=', 'deployable');
         }
 
         if ($request->filled('pending')) {
-            $statuslabels = $statuslabels->where('pending', '=', '1');
+            $statuslabels = $statuslabels->where('status_type', '=', 'pending');
         }
 
         if ($request->filled('archived')) {
-            $statuslabels = $statuslabels->where('archived', '=', '1');
+            $statuslabels = $statuslabels->where('status_type', '=', 'archived');
         }
 
         $statuslabels = $statuslabels->orderBy('name', 'ASC')->paginate(50);

app/Http/Controllers/Assets/AssetsController.php

@@ -352,7 +352,7 @@ class AssetsController extends Controller
         $status = Statuslabel::find($request->input('status_id'));
 
         // This is a non-deployable status label - we should check the asset back in.
-        if (($status && $status->getStatuslabelType() != 'deployable') && ($target = $asset->assignedTo)) {
+        if (($status && $status->status_type != 'deployable') && ($target = $asset->assignedTo)) {
 
             $originalValues = $asset->getRawOriginal();
             $asset->assigned_to = null;

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -245,12 +245,10 @@ class BulkAssetsController extends Controller
             || ($request->filled('status_id'))
             || ($request->filled('model_id'))
             || ($request->filled('next_audit_date'))
-            || ($request->filled('asset_eol_date'))
             || ($request->filled('null_name'))
             || ($request->filled('null_purchase_date'))
             || ($request->filled('null_expected_checkin_date'))
             || ($request->filled('null_next_audit_date'))
-            || ($request->filled('null_asset_eol_date'))
             || ($request->anyFilled($custom_field_columns))
 
         ) {
@@ -273,8 +271,7 @@ class BulkAssetsController extends Controller
                     ->conditionallyAddItem('requestable')
                     ->conditionallyAddItem('supplier_id')
                     ->conditionallyAddItem('warranty_months')
-                    ->conditionallyAddItem('next_audit_date')
-                    ->conditionallyAddItem('asset_eol_date');
+                    ->conditionallyAddItem('next_audit_date');
                     foreach ($custom_field_columns as $key => $custom_field_column) {
                         $this->conditionallyAddItem($custom_field_column); 
                    }
@@ -319,17 +316,6 @@ class BulkAssetsController extends Controller
                     $this->update_array['next_audit_date'] = null;
                 }
 
-                if ($request->input('null_asset_eol_date')=='1') {
-                    $this->update_array['asset_eol_date'] = null;
-
-                    // If they are nulling the EOL date to allow it to calculate, set eol explicit to 0
-                    if ($request->input('calc_eol')=='1') {
-                        $this->update_array['eol_explicit'] = 0;
-                    }
-                }
-
-
-
                 if ($request->filled('purchase_cost')) {
                     $this->update_array['purchase_cost'] =  $request->input('purchase_cost');
                 }

app/Http/Controllers/ModalController.php

@@ -40,7 +40,7 @@ class ModalController extends Controller
         $view = view("modals.${type}");
 
             if ($type == "statuslabel") {
-            $view->with('statuslabel_types', Helper::statusTypeList());
+            $view->with('status_types', Helper::statusTypeList());
         }
         if (in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {
             $view->with('kitId', $itemId);

app/Http/Controllers/StatuslabelsController.php

@@ -47,7 +47,7 @@ class StatuslabelsController extends Controller
 
         return view('statuslabels/edit')
             ->with('item', new Statuslabel)
-            ->with('statuslabel_types', Helper::statusTypeList());
+            ->with('status_types', Helper::statusTypeList());
     }
 
     /**
@@ -61,19 +61,11 @@ class StatuslabelsController extends Controller
         // create a new model instance
         $statusLabel = new Statuslabel();
 
-        if ($request->missing('statuslabel_types')) {
-            return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);
-        }
-
-        $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('statuslabel_types'));
-
         // Save the Statuslabel data
         $statusLabel->name = $request->input('name');
         $statusLabel->created_by = auth()->id();
         $statusLabel->notes = $request->input('notes');
-        $statusLabel->deployable = $statusType['deployable'];
-        $statusLabel->pending = $statusType['pending'];
-        $statusLabel->archived = $statusType['archived'];
+        $statusLabel->status_type = $request->input('status_type');
         $statusLabel->color = $request->input('color');
         $statusLabel->show_in_nav = $request->input('show_in_nav', 0);
         $statusLabel->default_label = $request->input('default_label', 0);
@@ -100,11 +92,7 @@ class StatuslabelsController extends Controller
             return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
         }
 
-        $use_statuslabel_type = $item->getStatuslabelType();
-
-        $statuslabel_types = ['' => trans('admin/hardware/form.select_statustype')] + ['undeployable' => trans('admin/hardware/general.undeployable')] + ['pending' => trans('admin/hardware/general.pending')] + ['archived' => trans('admin/hardware/general.archived')] + ['deployable' => trans('admin/hardware/general.deployable')];
-
-        return view('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
+        return view('statuslabels/edit', compact('item'))->with('status_types', Helper::statusTypeList());;
     }
 
     /**
@@ -121,17 +109,10 @@ class StatuslabelsController extends Controller
             return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
         }
 
-        if (! $request->filled('statuslabel_types')) {
-            return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);
-        }
-
         // Update the Statuslabel data
-        $statustype = Statuslabel::getStatuslabelTypesForDB($request->input('statuslabel_types'));
         $statuslabel->name = $request->input('name');
         $statuslabel->notes = $request->input('notes');
-        $statuslabel->deployable = $statustype['deployable'];
-        $statuslabel->pending = $statustype['pending'];
-        $statuslabel->archived = $statustype['archived'];
+        $statuslabel->status_type =  $request->input('status_type');
         $statuslabel->color = $request->input('color');
         $statuslabel->show_in_nav = $request->input('show_in_nav', 0);
         $statuslabel->default_label = $request->input('default_label', 0);

app/Http/Controllers/Users/UsersController.php

@@ -288,31 +288,33 @@ class UsersController extends Controller
             $user->password = bcrypt($request->input('password'));
         }
 
+
         // Update the location of any assets checked out to this user
         Asset::where('assigned_type', User::class)
             ->where('assigned_to', $user->id)
             ->update(['location_id' => $user->location_id]);
 
-        $permissions_array = $request->input('permission');
+            $permissions_array = $request->input('permission');
 
-        // Strip out the superuser permission if the user isn't a superadmin
-        if (! auth()->user()->isSuperUser()) {
-            unset($permissions_array['superuser']);
-            $permissions_array['superuser'] = $orig_superuser;
-        }
 
-        $user->permissions = json_encode($permissions_array);
+            // Strip out the superuser permission if the user isn't a superadmin
+            if (! auth()->user()->isSuperUser()) {
+                unset($permissions_array['superuser']);
+                $permissions_array['superuser'] = $orig_superuser;
+            }
 
-        // Handle uploaded avatar
-        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
-        session()->put(['redirect_option' => $request->get('redirect_option')]);
+            $user->permissions = json_encode($permissions_array);
 
-        if ($user->save()) {
-            // Redirect to the user page
-            return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))
-                ->with('success', trans('admin/users/message.success.update'));
-        }
-        return redirect()->back()->withInput()->withErrors($user->getErrors());
+            // Handle uploaded avatar
+            app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+
+            if ($user->save()) {
+                // Redirect to the user page
+                return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))
+                    ->with('success', trans('admin/users/message.success.update'));
+            }
+            return redirect()->back()->withInput()->withErrors($user->getErrors());
     }
 
     /**

app/Http/Requests/ItemImportRequest.php

@@ -38,11 +38,10 @@ class ItemImportRequest extends FormRequest
 
         $filename = config('app.private_uploads').'/imports/'.$import->file_path;
         $import->import_type = $this->input('import-type');
-        $class = ucfirst($import->import_type);
+        $class = title_case($import->import_type);
         $classString = "App\\Importer\\{$class}Importer";
         $importer = new $classString($filename);
         $import->field_map = request('column-mappings');
-        $import->created_by = auth()->id();
         $import->save();
         $fieldMappings = [];
 
@@ -61,7 +60,7 @@ class ItemImportRequest extends FormRequest
             $fieldMappings = array_change_key_case(array_flip($import->field_map), CASE_LOWER);
         }
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
-                 ->setCreatedBy(auth()->id())
+                 ->setUserId(auth()->id())
                  ->setUpdating($this->get('import-update'))
                  ->setShouldNotify($this->get('send-welcome'))
                  ->setUsernameFormat('firstname.lastname')

app/Http/Requests/StoreNotificationSettings.php

@@ -25,7 +25,7 @@ class StoreNotificationSettings extends FormRequest
     {
         return [
             'alert_email'                         => 'email_array|nullable',
-            'admin_cc_email'                      => 'email_array|nullable',
+            'admin_cc_email'                      => 'email|nullable',
             'alert_threshold'                     => 'numeric|nullable|gt:0',
             'alert_interval'                      => 'numeric|nullable|gt:0',
             'audit_warning_days'                  => 'numeric|nullable|gt:0',

app/Http/Transformers/AssetMaintenancesTransformer.php

@@ -39,7 +39,7 @@ class AssetMaintenancesTransformer
             'status_label' => ($assetmaintenance->asset->assetstatus) ? [
                 'id' => (int) $assetmaintenance->asset->assetstatus->id,
                 'name'=> e($assetmaintenance->asset->assetstatus->name),
-                'status_type'=> e($assetmaintenance->asset->assetstatus->getStatuslabelType()),
+                'status_type'=> e($assetmaintenance->asset->assetstatus->status_type),
                 'status_meta' => e($assetmaintenance->asset->present()->statusMeta),
             ] : null,
             'company' => (($assetmaintenance->asset) && ($assetmaintenance->asset->company)) ? [

app/Http/Transformers/AssetModelsTransformer.php

@@ -65,10 +65,6 @@ class AssetModelsTransformer
             'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
             'requestable' => ($assetmodel->requestable == '1') ? true : false,
             'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
-            'created_by' => ($assetmodel->adminuser) ? [
-                'id' => (int) $assetmodel->adminuser->id,
-                'name'=> e($assetmodel->adminuser->present()->fullName()),
-            ] : null,
             'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'),
             'deleted_at' => Helper::getFormattedDateObject($assetmodel->deleted_at, 'datetime'),

app/Http/Transformers/AssetsTransformer.php

@@ -8,7 +8,6 @@ use App\Models\Setting;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Auth;
 
 class AssetsTransformer
 {
@@ -45,8 +44,8 @@ class AssetsTransformer
             'status_label' => ($asset->assetstatus) ? [
                 'id' => (int) $asset->assetstatus->id,
                 'name'=> e($asset->assetstatus->name),
-                'status_type'=> e($asset->assetstatus->getStatuslabelType()),
-                'status_meta' => e($asset->present()->statusMeta),
+                'status_type'=> e($asset->assetstatus->status_type),
+                'status_meta' => e($asset->assetstatus->status_type),
             ] : null,
             'category' => (($asset->model) && ($asset->model->category)) ? [
                 'id' => (int) $asset->model->category->id,

app/Http/Transformers/StatuslabelsTransformer.php

@@ -24,7 +24,8 @@ class StatuslabelsTransformer
         $array = [
             'id' => (int) $statuslabel->id,
             'name' => e($statuslabel->name),
-            'type' => $statuslabel->getStatuslabelType(),
+            'type' => $statuslabel->status_type, // legacy - to be removed in later versions
+            'status_type' => $statuslabel->status_type,
             'color' => ($statuslabel->color) ? e($statuslabel->color) : null,
             'show_in_nav' => ($statuslabel->show_in_nav == '1') ? true : false,
             'default_label' => ($statuslabel->default_label == '1') ? true : false,

app/Importer/AccessoryImporter.php

@@ -42,7 +42,6 @@ class AccessoryImporter extends ItemImporter
         }
         $this->log('No Matching Accessory, Creating a new one');
         $accessory = new Accessory();
-        $accessory->created_by = auth()->id();
         $this->item['model_number'] = $this->findCsvMatch($row, "model_number");
         $this->item['min_amt'] = $this->findCsvMatch($row, "min_amt");
         $accessory->fill($this->sanitizeItemForStoring($accessory));

app/Importer/AssetImporter.php

@@ -18,8 +18,8 @@ class AssetImporter extends ItemImporter
 
         $this->defaultStatusLabelId = Statuslabel::first()->id;
         
-        if (!is_null(Statuslabel::deployable()->first())) {
-            $this->defaultStatusLabelId = Statuslabel::deployable()->first()->id;
+        if (!is_null(Statuslabel::where('status_type', 'deployable')->first())) {
+            $this->defaultStatusLabelId = Statuslabel::where('status_type', 'deployable')->first()->id;
         }
     }
 

app/Importer/AssetModelImporter.php

@@ -1,174 +0,0 @@
-<?php
-
-namespace App\Importer;
-
-use App\Models\AssetModel;
-use App\Models\Depreciation;
-use App\Models\CustomFieldset;
-use Illuminate\Support\Facades\Log;
-
-/**
- * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
- * Importer\Importer.php. [ALG]
- *
- * Class LocationImporter
- */
-class AssetModelImporter extends ItemImporter
-{
-    protected $models;
-
-    public function __construct($filename)
-    {
-        parent::__construct($filename);
-    }
-
-    protected function handle($row)
-    {
-        parent::handle($row);
-        $this->createAssetModelIfNotExists($row);
-    }
-
-    /**
-     * Create a model if a duplicate does not exist.
-     * @todo Investigate how this should interact with Importer::createModelIfNotExists
-     *
-     * @author A. Gianotto
-     * @since 6.1.0
-     * @param array $row
-     */
-    public function createAssetModelIfNotExists(array $row)
-    {
-
-        $editingAssetModel = false;
-        $assetModel = AssetModel::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
-
-        if ($assetModel) {
-            if (! $this->updating) {
-                $this->log('A matching Model '.$this->item['name'].' already exists');
-                return;
-            }
-
-            $this->log('Updating Model');
-            $editingAssetModel = true;
-        } else {
-            $this->log('No Matching Model, Create a new one');
-            $assetModel = new AssetModel();
-        }
-
-        // Pull the records from the CSV to determine their values
-        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
-        $this->item['category'] = trim($this->findCsvMatch($row, 'category'));
-        $this->item['manufacturer'] = trim($this->findCsvMatch($row, 'manufacturer'));
-        $this->item['min_amt'] = trim($this->findCsvMatch($row, 'min_amt'));
-        $this->item['model_number'] = trim($this->findCsvMatch($row, 'model_number'));
-        $this->item['eol'] = trim($this->findCsvMatch($row, 'eol'));
-        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
-        $this->item['fieldset'] = trim($this->findCsvMatch($row, 'fieldset'));
-        $this->item['depreciation'] = trim($this->findCsvMatch($row, 'depreciation'));
-        $this->item['requestable'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable'))) == 1) ? 1 : 0;
-
-        if (!empty($this->item['category'])) {
-            if ($category = $this->createOrFetchCategory($this->item['category'])) {
-                $this->item['category_id'] = $category;
-            }
-        }
-        if (!empty($this->item['manufacturer'])) {
-            if ($manufacturer = $this->createOrFetchManufacturer($this->item['manufacturer'])) {
-                $this->item['manufacturer_id'] = $manufacturer;
-            }
-        }
-
-        if (!empty($this->item['depreciation'])) {
-            if ($depreciation = $this->fetchDepreciation($this->item['depreciation'])) {
-                $this->item['depreciation_id'] = $depreciation;
-            }
-        }
-
-        if (!empty($this->item['fieldset'])) {
-            if ($fieldset = $this->createOrFetchCustomFieldset($this->item['fieldset'])) {
-                $this->item['fieldset_id'] = $fieldset;
-            }
-        }
-
-        Log::debug('Item array is: ');
-        Log::debug(print_r($this->item, true));
-
-
-        if ($editingAssetModel) {
-            Log::debug('Updating existing model');
-            $assetModel->update($this->sanitizeItemForUpdating($assetModel));
-        } else {
-            Log::debug('Creating model');
-            $assetModel->fill($this->sanitizeItemForStoring($assetModel));
-            $assetModel->created_by = auth()->id();
-        }
-
-        if ($assetModel->save()) {
-            $this->log('AssetModel '.$assetModel->name.' created or updated from CSV import');
-            return $assetModel;
-
-        } else {
-            $this->log($assetModel->getErrors()->first());
-            $this->addErrorToBag($assetModel,  $assetModel->getErrors()->keys()[0], $assetModel->getErrors()->first());
-            return $assetModel->getErrors();
-        }
-
-    }
-
-
-    /**
-     * Fetch an existing depreciation, or create new if it doesn't exist.
-     *
-     * We only do a fetch vs create here since Depreciations have additional fields required
-     * and cannot be created without them (months, for example.))
-     *
-     * @author A. Gianotto
-     * @since 7.1.3
-     * @param $depreciation_name string
-     * @return int id of depreciation created/found
-     */
-    public function fetchDepreciation($depreciation_name) : ?int
-    {
-        if ($depreciation_name != '') {
-
-            if ($depreciation = Depreciation::where('name', '=', $depreciation_name)->first()) {
-                $this->log('A matching Depreciation '.$depreciation_name.' already exists');
-                return $depreciation->id;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Fetch an existing fieldset, or create new if it doesn't exist
-     *
-     * @author A. Gianotto
-     * @since 7.1.3
-     * @param $fieldset_name string
-     * @return int id of fieldset created/found
-     */
-    public function createOrFetchCustomFieldset($fieldset_name) : ?int
-    {
-        if ($fieldset_name != '') {
-            $fieldset = CustomFieldset::where('name', '=', $fieldset_name)->first();
-
-            if ($fieldset) {
-                $this->log('A matching fieldset '.$fieldset_name.' already exists');
-                return $fieldset->id;
-            }
-
-            $fieldset = new CustomFieldset();
-            $fieldset->name = $fieldset_name;
-
-            if ($fieldset->save()) {
-                $this->log('Fieldset '.$fieldset_name.' was created');
-
-                return $fieldset->id;
-            }
-            $this->logError($fieldset, 'Fieldset');
-        }
-
-        return null;
-    }
-}

app/Importer/ComponentImporter.php

@@ -47,7 +47,6 @@ class ComponentImporter extends ItemImporter
         }
         $this->log('No matching component, creating one');
         $component = new Component;
-        $component->created_by = auth()->id();
         $component->fill($this->sanitizeItemForStoring($component));
 
         // This sets an attribute on the Loggable trait for the action log
@@ -59,7 +58,7 @@ class ComponentImporter extends ItemImporter
             if (isset($this->item['asset_tag']) && ($asset = Asset::where('asset_tag', $this->item['asset_tag'])->first())) {
                 $component->assets()->attach($component->id, [
                     'component_id' => $component->id,
-                    'created_by' => auth()->id(),
+                    'created_by' => $this->created_by,
                     'created_at' => date('Y-m-d H:i:s'),
                     'assigned_qty' => 1, // Only assign the first one to the asset
                     'asset_id' => $asset->id,

app/Importer/ConsumableImporter.php

@@ -41,7 +41,6 @@ class ConsumableImporter extends ItemImporter
         }
         $this->log('No matching consumable, creating one');
         $consumable = new Consumable();
-        $consumable->created_by = auth()->id();
         $this->item['model_number'] = trim($this->findCsvMatch($row, 'model_number'));
         $this->item['item_no'] = trim($this->findCsvMatch($row, 'item_number'));
         $this->item['min_amt'] = trim($this->findCsvMatch($row, "min_amt"));

app/Importer/Importer.php

@@ -363,7 +363,6 @@ abstract class Importer
 
         // No luck finding a user on username or first name, let's create one.
         $user = new User;
-
         $user->first_name = $user_array['first_name'];
         $user->last_name = $user_array['last_name'];
         $user->username = $user_array['username'];
@@ -407,7 +406,7 @@ abstract class Importer
      *
      * @return self
      */
-    public function setCreatedBy($created_by)
+    public function setUserId($created_by)
     {
         $this->created_by = $created_by;
 
@@ -493,16 +492,6 @@ abstract class Importer
 
     public function fetchHumanBoolean($value)
     {
-        $true = [
-            'yes',
-            'y',
-            'true',
-        ];
-
-        if (in_array(strtolower($value), $true)) {
-            return 1;
-        }
-
         return (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
     }
 
@@ -539,7 +528,6 @@ abstract class Importer
         return null;
     }
 
-
     /**
      * Fetch an existing manager
      *

app/Importer/ItemImporter.php

@@ -94,7 +94,7 @@ class ItemImporter extends Importer
 
         $this->item['qty'] = $this->findCsvMatch($row, 'quantity');
         $this->item['requestable'] = $this->findCsvMatch($row, 'requestable');
-        $this->item['created_by'] = auth()->id();
+        $this->item['created_by'] = $this->created_by;
         $this->item['serial'] = $this->findCsvMatch($row, 'serial');
         // NO need to call this method if we're running the user import.
         // TODO: Merge these methods.
@@ -113,7 +113,7 @@ class ItemImporter extends Importer
     protected function determineCheckout($row)
     {
         // Locations don't get checked out to anyone/anything
-        if ((get_class($this) == LocationImporter::class) || (get_class($this) == AssetModelImporter::class)) {
+        if (get_class($this) == LocationImporter::class) {
             return;
         }
 
@@ -249,7 +249,6 @@ class ItemImporter extends Importer
 
         $this->log('No Matching Model, Creating a new one');
         $asset_model = new AssetModel();
-        $asset_model->created_by = auth()->id();
         $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
         $item['name'] = $asset_model_name;
         $item['model_number'] = $asset_modelNumber;
@@ -257,8 +256,11 @@ class ItemImporter extends Importer
         $item['category_id'] = $this->createOrFetchCategory($asset_model_category);
 
         $asset_model->fill($item);
+        //$asset_model = AssetModel::firstOrNew($item);
         $item = null;
 
+
+
         if ($asset_model->save()) {
             $this->log('Asset Model '.$asset_model_name.' with model number '.$asset_modelNumber.' was created');
 
@@ -285,28 +287,21 @@ class ItemImporter extends Importer
         $classname = class_basename(get_class($this));
         $item_type = strtolower(substr($classname, 0, strpos($classname, 'Importer')));
 
-        // If we're importing asset models only (without attached assets), override the category type to asset
-        if ($item_type == 'assetmodel') {
-            $item_type = 'asset';
-        }
-
         if (empty($asset_category)) {
             $asset_category = 'Unnamed Category';
         }
-
-
         $category = Category::where(['name' => $asset_category, 'category_type' => $item_type])->first();
 
-
         if ($category) {
-            $this->log('A matching category: '.$category->name.' already exists');
+            $this->log('A matching category: '.$asset_category.' already exists');
+
             return $category->id;
         }
 
         $category = new Category();
-        $category->created_by = auth()->id();
         $category->name = $asset_category;
         $category->category_type = $item_type;
+        $category->created_by = $this->created_by;
 
         if ($category->save()) {
             $this->log('Category '.$asset_category.' was created');
@@ -335,7 +330,6 @@ class ItemImporter extends Importer
             return $company->id;
         }
         $company = new Company();
-        $company->created_by = auth()->id();
         $company->name = $asset_company_name;
 
         if ($company->save()) {
@@ -392,7 +386,6 @@ class ItemImporter extends Importer
         }
         $this->log('Creating a new status');
         $status = new Statuslabel();
-        $status->created_by = auth()->id();
         $status->name = trim($asset_statuslabel_name);
 
         $status->deployable = 1;
@@ -432,7 +425,7 @@ class ItemImporter extends Importer
         //Otherwise create a manufacturer.
         $manufacturer = new Manufacturer();
         $manufacturer->name = trim($item_manufacturer);
-        $manufacturer->created_by = auth()->id();
+        $manufacturer->created_by = $this->created_by;
 
         if ($manufacturer->save()) {
             $this->log('Manufacturer '.$manufacturer->name.' was created');
@@ -473,7 +466,7 @@ class ItemImporter extends Importer
         $location->city = '';
         $location->state = '';
         $location->country = '';
-        $location->created_by = auth()->id();
+        $location->created_by = $this->created_by;
 
         if ($location->save()) {
             $this->log('Location '.$asset_location.' was created');
@@ -509,7 +502,7 @@ class ItemImporter extends Importer
 
         $supplier = new Supplier();
         $supplier->name = $item_supplier;
-        $supplier->created_by = auth()->id();
+        $supplier->created_by = $this->created_by;
 
         if ($supplier->save()) {
             $this->log('Supplier '.$item_supplier.' was created');

app/Importer/LicenseImporter.php

@@ -84,7 +84,6 @@ class LicenseImporter extends ItemImporter
             $license->update($this->sanitizeItemForUpdating($license));
         } else {
             $license->fill($this->sanitizeItemForStoring($license));
-            $license->created_by = auth()->id();
         }
 
         // This sets an attribute on the Loggable trait for the action log

app/Importer/LocationImporter.php

@@ -51,7 +51,6 @@ class LocationImporter extends ItemImporter
         } else {
             $this->log('No Matching Location, Create a new one');
             $location = new Location;
-            $location->created_by = auth()->id();
         }
 
         // Pull the records from the CSV to determine their values
@@ -66,6 +65,7 @@ class LocationImporter extends ItemImporter
         $this->item['ldap_ou'] = trim($this->findCsvMatch($row, 'ldap_ou'));
         $this->item['manager'] = trim($this->findCsvMatch($row, 'manager'));
         $this->item['manager_username'] = trim($this->findCsvMatch($row, 'manager_username'));
+        $this->item['created_by'] = auth()->id();
 
         if ($this->findCsvMatch($row, 'parent_location')) {
             $this->item['parent_id'] = $this->createOrFetchLocation(trim($this->findCsvMatch($row, 'parent_location')));

app/Importer/UserImporter.php

@@ -114,7 +114,6 @@ class UserImporter extends ItemImporter
 
         $this->log('No matching user, creating one');
         $user = new User();
-        $user->created_by = auth()->id();
         $user->fill($this->sanitizeItemForStoring($user));
 
         if ($user->save()) {

app/Listeners/CheckoutableListener.php

@@ -3,20 +3,13 @@
 namespace App\Listeners;
 
 use App\Events\CheckoutableCheckedOut;
-use App\Mail\CheckinAccessoryMail;
-use App\Mail\CheckinLicenseMail;
-use App\Mail\CheckoutAccessoryMail;
-use App\Mail\CheckoutAssetMail;
-use App\Mail\CheckinAssetMail;
-use App\Mail\CheckoutConsumableMail;
-use App\Mail\CheckoutLicenseMail;
 use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
 use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\LicenseSeat;
-use App\Models\Location;
+use App\Models\Recipients\AdminRecipient;
 use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\CheckinAccessoryNotification;
@@ -27,12 +20,9 @@ use App\Notifications\CheckoutAssetNotification;
 use App\Notifications\CheckoutConsumableNotification;
 use App\Notifications\CheckoutLicenseSeatNotification;
 use GuzzleHttp\Exception\ClientException;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Exception;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Str;
-use Osama\LaravelTeamsNotification\TeamsNotification;
 
 class CheckoutableListener
 {
@@ -53,57 +43,33 @@ class CheckoutableListener
         /**
          * Make a checkout acceptance and attach it in the notification
          */
-        $settings = Setting::getSettings();
         $acceptance = $this->getCheckoutAcceptance($event);
-        $adminCcEmailsArray = [];
+        $notifiables = $this->getNotifiables($event);
 
-        if($settings->admin_cc_email !== '') {
-            $adminCcEmail = $settings->admin_cc_email;
-            $adminCcEmailsArray = array_map('trim', explode(',', $adminCcEmail));
-        }
-        $ccEmails = array_filter($adminCcEmailsArray);
-        $mailable = $this->getCheckoutMailType($event, $acceptance);
-        $notifiable = $this->getNotifiables($event);
-
-        if  (!$event->checkedOutTo->locale){
-            $mailable->locale($event->checkedOutTo->locale);
-        }
         // Send email notifications
         try {
-            /**
-             * Send an email if any of the following conditions are met:
-             * 1. The asset requires acceptance
-             * 2. The item has a EULA
-             * 3. The item should send an email at check-in/check-out
-             */
+            foreach ($notifiables as $notifiable) {
+                if ($notifiable instanceof User && $notifiable->email != '') {
+                    if (! $event->checkedOutTo->locale){
+                        Notification::locale(Setting::getSettings()->locale)->send($notifiable, $this->getCheckoutNotification($event, $acceptance));
+                    }
+                    else {
+                        Notification::send($notifiable, $this->getCheckoutNotification($event, $acceptance));
+                    }
+                }
+            }
 
-                if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                    $this->checkoutableShouldSendEmail($event)) {
-                    Log::info('Sending checkout email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
-                    if (!empty($notifiable)) {
-                        Mail::to($notifiable)->cc($ccEmails)->send($mailable);
-                    } elseif (!empty($ccEmails)) {
-                        Mail::cc($ccEmails)->send($mailable);
-                    }
-                    Log::info('Checkout Mail sent.');
-                }
-        } catch (ClientException $e) {
-            Log::debug("Exception caught during checkout email: " . $e->getMessage());
-        } catch (Exception $e) {
-            Log::debug("Exception caught during checkout email: " . $e->getMessage());
-        }
-//                 Send Webhook notification
-        try{
-                if ($this->shouldSendWebhookNotification()) {
-                    if ($this->newMicrosoftTeamsWebhookEnabled()) {
-                        $message = $this->getCheckoutNotification($event)->toMicrosoftTeams();
-                        $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
-                        $notification->success()->sendMessage($message[0], $message[1]);  // Send the message to Microsoft Teams
-                    } else {
-                        Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
-                            ->notify($this->getCheckoutNotification($event, $acceptance));
-                    }
+            // Send Webhook notification
+            if ($this->shouldSendWebhookNotification()) {
+                // Slack doesn't include the URL in its messaging format, so this is needed to hit the endpoint
+                if (Setting::getSettings()->webhook_selected === 'slack' || Setting::getSettings()->webhook_selected === 'general') {
+                    Notification::route('slack', Setting::getSettings()->webhook_endpoint)
+                        ->notify($this->getCheckoutNotification($event, $acceptance));
+                } else {
+                    Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
+                        ->notify($this->getCheckoutNotification($event, $acceptance));
                 }
+            }
         } catch (ClientException $e) {
             Log::debug("Exception caught during checkout notification: " . $e->getMessage());
         } catch (Exception $e) {
@@ -137,57 +103,34 @@ class CheckoutableListener
                 }
             }
         }
-        $settings = Setting::getSettings();
-        $adminCcEmailsArray = [];
 
-        if($settings->admin_cc_email !== '') {
-            $adminCcEmail = $settings->admin_cc_email;
-            $adminCcEmailsArray = array_map('trim', explode(',', $adminCcEmail));
-        }
-        $ccEmails = array_filter($adminCcEmailsArray);
-        $mailable =  $this->getCheckinMailType($event);
-        $notifiable = $this->getNotifiables($event);
-        if  (!$event->checkedOutTo->locale){
-            $mailable->locale($event->checkedOutTo->locale);
-        }
+        $notifiables = $this->getNotifiables($event);
         // Send email notifications
         try {
-            /**
-             * Send an email if any of the following conditions are met:
-             * 1. The asset requires acceptance
-             * 2. The item has a EULA
-             * 3. The item should send an email at check-in/check-out
-             */
-                if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                    $this->checkoutableShouldSendEmail($event)) {
-                    Log::info('Sending checkin email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
-                    if (!empty($notifiable)) {
-                        Mail::to($notifiable)->cc($ccEmails)->send($mailable);
-                    } elseif (!empty($ccEmails)){
-                        Mail::cc($ccEmails)->send($mailable);
+            foreach ($notifiables as $notifiable) {
+                if ($notifiable instanceof User && $notifiable->email != '') {
+                    if (! $event->checkedOutTo->locale){
+                        Notification::locale(Setting::getSettings()->locale)->send($notifiable, $this->getCheckoutNotification($event, $acceptance));
+                    }
+                    else {
+                        Notification::send($notifiable, $this->getCheckinNotification($event));
                     }
-                    Log::info('Checkin Mail sent.');
                 }
-        } catch (ClientException $e) {
-            Log::debug("Exception caught during checkin email: " . $e->getMessage());
-        } catch (Exception $e) {
-            Log::debug("Exception caught during checkin email: " . $e->getMessage());
-        }
-
-        // Send Webhook notification
-        try {
+            }
+            // Send Webhook notification
             if ($this->shouldSendWebhookNotification()) {
-                if ($this->newMicrosoftTeamsWebhookEnabled()) {
-                        $message = $this->getCheckinNotification($event)->toMicrosoftTeams();
-                        $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
-                        $notification->success()->sendMessage($message[0], $message[1]);  // Send the message to Microsoft Teams
-                    } else {
-                        Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
-                            ->notify($this->getCheckinNotification($event));
-                    }
+                // Slack doesn't include the URL in its messaging format, so this is needed to hit the endpoint
+                if (Setting::getSettings()->webhook_selected === 'slack' || Setting::getSettings()->webhook_selected === 'general') {
+                    Notification::route('slack', Setting::getSettings()->webhook_endpoint)
+                        ->notify($this->getCheckinNotification($event));
+                } else {
+                    Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
+                        ->notify($this->getCheckinNotification($event));
                 }
+            }
+
         } catch (ClientException $e) {
-            Log::warning("Exception caught during checkin notification: " . $e->getMessage());
+            Log::warning("Exception caught during checkout notification: " . $e->getMessage());
         } catch (Exception $e) {
             Log::warning("Exception caught during checkin notification: " . $e->getMessage());
         }
@@ -216,6 +159,33 @@ class CheckoutableListener
         return $acceptance;      
     }
 
+    /**
+     * Gets the entities to be notified of the passed event
+     * 
+     * @param  Event $event
+     * @return Collection
+     */
+    private function getNotifiables($event)
+    {
+        $notifiables = collect();
+
+        /**
+         * Notify who checked out the item as long as the model can route notifications
+         */
+        if (method_exists($event->checkedOutTo, 'routeNotificationFor')) {
+            $notifiables->push($event->checkedOutTo);
+        }
+
+        /**
+         * Notify Admin users if the settings is activated
+         */
+        if ((Setting::getSettings()) && (Setting::getSettings()->admin_cc_email != '')) {
+            $notifiables->push(new AdminRecipient());
+        }
+
+        return $notifiables;       
+    }
+
     /**
      * Get the appropriate notification for the event
      * 
@@ -264,7 +234,7 @@ class CheckoutableListener
                 break;
             case Consumable::class:
                 $notificationClass = CheckoutConsumableNotification::class;
-                break;
+                break;    
             case LicenseSeat::class:
                 $notificationClass = CheckoutLicenseSeatNotification::class;
                 break;
@@ -273,43 +243,6 @@ class CheckoutableListener
 
         return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $acceptance, $event->note);
     }
-    private function getCheckoutMailType($event, $acceptance){
-        $lookup = [
-            Accessory::class => CheckoutAccessoryMail::class,
-            Asset::class => CheckoutAssetMail::class,
-            LicenseSeat::class => CheckoutLicenseMail::class,
-            Consumable::class => CheckoutConsumableMail::class,
-        ];
-        $mailable= $lookup[get_class($event->checkoutable)];
-
-        return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $event->note, $acceptance);
-
-    }
-    private function getCheckinMailType($event){
-        $lookup = [
-            Accessory::class => CheckinAccessoryMail::class,
-            Asset::class => CheckinAssetMail::class,
-            LicenseSeat::class => CheckinLicenseMail::class,
-        ];
-
-        $mailable= $lookup[get_class($event->checkoutable)];
-
-        return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);
-
-    }
-    private function getNotifiables($event){
-
-        if($event->checkedOutTo instanceof Asset){
-            $event->checkedOutTo->load('assignedTo');
-            return $event->checkedOutTo->assignedto?->email ?? '';
-        }
-        else if($event->checkedOutTo instanceof Location) {
-            return $event->checkedOutTo->manager?->email ?? '';
-        }
-        else{
-            return $event->checkedOutTo->email;
-        }
-    }
 
     /**
      * Register the listeners for the subscriber.
@@ -338,17 +271,4 @@ class CheckoutableListener
     {
         return Setting::getSettings() && Setting::getSettings()->webhook_endpoint;
     }
-
-    private function checkoutableShouldSendEmail($event): bool
-    {
-        if($event->checkoutable instanceof LicenseSeat){
-            return $event->checkoutable->license->checkin_email();
-        }
-        return (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email());
-    }
-
-    private function newMicrosoftTeamsWebhookEnabled(): bool
-    {
-        return Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows');
-    }
 }

app/Livewire/Importer.php

@@ -73,9 +73,6 @@ class Importer extends Component
             case 'asset':
                 $results = $this->assets_fields;
                 break;
-            case 'assetModel':
-                $results = $this->assetmodels_fields;
-                break;
             case 'accessory':
                 $results = $this->accessories_fields;
                 break;
@@ -85,9 +82,6 @@ class Importer extends Component
             case 'component':
                 $results = $this->components_fields;
                 break;
-            case 'consumable':
-                $results = $this->consumables_fields;
-                break;
             case 'license':
                 $results = $this->licenses_fields;
                 break;
@@ -97,14 +91,10 @@ class Importer extends Component
             case 'location':
                 $results = $this->locations_fields;
                 break;
-            case 'user':
-                $results = $this->users_fields;
-                break;
             default:
                 $results = [];
         }
         asort($results, SORT_FLAG_CASE | SORT_STRING);
-
         if ($type == "asset") {
             // add Custom Fields after a horizontal line
             $results['-'] = "———" . trans('admin/custom_fields/general.custom_fields') . "———’";
@@ -117,7 +107,6 @@ class Importer extends Component
 
     public function updatingTypeOfImport($type)
     {
-
         // go through each header, find a matching field to try and map it to.
         foreach ($this->headerRow as $i => $header) {
             // do we have something mapped already?
@@ -163,14 +152,13 @@ class Importer extends Component
     {
         $this->authorize('import');
         $this->importTypes = [
-            'accessory'     =>  trans('general.accessories'),
-            'asset'         =>      trans('general.assets'),
-            'assetModel'    =>      trans('general.asset_models'),
-            'component'     =>  trans('general.components'),
-            'consumable'    => trans('general.consumables'),
-            'license'       =>    trans('general.licenses'),
-            'location'      =>   trans('general.locations'),
-            'user'          =>       trans('general.users'),
+            'asset' => trans('general.assets'),
+            'accessory' => trans('general.accessories'),
+            'consumable' => trans('general.consumables'),
+            'component' => trans('general.components'),
+            'license' => trans('general.licenses'),
+            'user' => trans('general.users'),
+            'location' => trans('general.locations'),
         ];
 
         /**
@@ -343,19 +331,6 @@ class Importer extends Component
             'parent_location' => trans('admin/locations/table.parent'),
         ];
 
-        $this->assetmodels_fields  = [
-            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset_model')]),
-            'category' => trans('general.category'),
-            'manufacturer' => trans('general.manufacturer'),
-            'model_number' => trans('general.model_no'),
-            'notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
-            'min_amt' => trans('mail.min_QTY'),
-            'fieldset' => trans('admin/models/general.fieldset'),
-            'eol' => trans('general.eol'),
-            'requestable' => trans('admin/models/general.requestable'),
-
-        ];
-
         // "real fieldnames" to a list of aliases for that field
         $this->aliases_fields = [
             'item_name' =>
@@ -384,23 +359,6 @@ class Importer extends Component
                     'eol date',
                     'asset eol date',
                 ],
-            'eol' =>
-                [
-                    'eol',
-                    'EOL',
-                    'eol months',
-                ],
-            'depreciation' =>
-                [
-                    'Depreciation',
-                    'depreciation',
-                ],
-            'requestable' =>
-                [
-                    'requestable',
-                    'Requestable',
-                ],
-
             'gravatar' =>
                 [
                     'gravatar',
@@ -545,6 +503,7 @@ class Importer extends Component
         if (!$this->activeFile) {
             $this->message = trans('admin/hardware/message.import.file_missing');
             $this->message_type = 'danger';
+
             return;
         }
 
@@ -559,8 +518,6 @@ class Importer extends Component
                 $this->field_map[] = null; // re-inject the 'nulls' if a file was imported with some 'Do Not Import' settings
             }
         }
-
-        $this->file_id = $id;
         $this->import_errors = null;
         $this->statusText = null;
 

app/Livewire/SlackSettingsForm.php

@@ -4,11 +4,10 @@ namespace App\Livewire;
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Str;
 use Livewire\Component;
 use App\Models\Setting;
 use App\Helpers\Helper;
-use Osama\LaravelTeamsNotification\TeamsNotification;
+
 class SlackSettingsForm extends Component
 {
     public $webhook_endpoint;
@@ -20,7 +19,6 @@ class SlackSettingsForm extends Component
     public $webhook_placeholder;
     public $webhook_icon;
     public $webhook_selected;
-    public $teams_webhook_deprecated;
     public array $webhook_text;
 
     public Setting $setting;
@@ -64,7 +62,7 @@ class SlackSettingsForm extends Component
                 "name" => trans('admin/settings/general.ms_teams'),
                 "icon" => "fa-brands fa-microsoft",
                 "placeholder" => "https://abcd.webhook.office.com/webhookb2/XXXXXXX",
-                "link" => "https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498",
+                "link" => "https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook?tabs=dotnet#create-incoming-webhooks-1",
                 "test" => "msTeamTestWebhook"
             ),
         ];
@@ -81,17 +79,15 @@ class SlackSettingsForm extends Component
         $this->webhook_channel = $this->setting->webhook_channel;
         $this->webhook_botname = $this->setting->webhook_botname;
         $this->webhook_options = $this->setting->webhook_selected;
-        $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
-        if($this->webhook_selected === 'microsoft' || $this->webhook_selected === 'google'){
+        if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
             $this->webhook_channel = '#NA';
         }
 
+
         if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
             $this->isDisabled= '';
         }
-        if($this->webhook_selected === 'microsoft' && $this->teams_webhook_deprecated) {
-            session()->flash('warning', 'The selected Microsoft Teams webhook URL will be deprecated Jan 31st, 2025. Please use a workflow URL. Microsofts Documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>');
-        }
+
     }
     public function updated($field) {
 
@@ -113,11 +109,7 @@ class SlackSettingsForm extends Component
         if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
             $this->webhook_channel = '#NA';
         }
-    }
 
-    public function updatedwebhookEndpoint()
-    {
-        $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
     }
 
     private function isButtonDisabled() {
@@ -134,9 +126,7 @@ class SlackSettingsForm extends Component
     public function render()
     {
         $this->isButtonDisabled();
-
         return view('livewire.slack-settings-form');
-
     }
 
     public function testWebhook(){
@@ -246,32 +236,20 @@ class SlackSettingsForm extends Component
     }
     public function msTeamTestWebhook(){
 
-        try {
+     $payload =
+        [
+            "@type" => "MessageCard",
+            "@context" => "http://schema.org/extensions",
+            "summary" => trans('mail.snipe_webhook_summary'),
+            "title" => trans('mail.snipe_webhook_test'),
+            "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
+        ];
 
-            if($this->teams_webhook_deprecated){
-                //will use the deprecated webhook format
-                $payload =
-                    [
-                        "@type" => "MessageCard",
-                        "@context" => "http://schema.org/extensions",
-                        "summary" => trans('mail.snipe_webhook_summary'),
-                        "title" => trans('mail.snipe_webhook_test'),
-                        "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
-                    ];
-                $response = Http::withHeaders([
-                    'content-type' => 'applications/json',
-                ])->post($this->webhook_endpoint,
-                    $payload)->throw();
-            }
-             else {
-                 $notification = new TeamsNotification($this->webhook_endpoint);
-                 $message = trans('general.webhook_test_msg', ['app' => $this->webhook_name]);
-                 $notification->success()->sendMessage($message);
-
-                 $response = Http::withHeaders([
-                     'content-type' => 'applications/json',
-                 ])->post($this->webhook_endpoint);
-             }
+         try {
+         $response = Http::withHeaders([
+             'content-type' => 'applications/json',
+         ])->post($this->webhook_endpoint,
+            $payload)->throw();
 
          if(($response->getStatusCode() == 302)||($response->getStatusCode() == 301)){
              return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));

app/Mail/CheckinAccessoryMail.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\Accessory;
-use App\Models\Setting;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class CheckinAccessoryMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(Accessory $accessory, $checkedOutTo, User $checkedInby, $note)
-    {
-        $this->item = $accessory;
-        $this->target = $checkedOutTo;
-        $this->admin = $checkedInby;
-        $this->note = $note;
-        $this->settings = Setting::getSettings();
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
-
-        return new Envelope(
-            from: $from,
-            subject: trans('mail.Accessory_Checkin_Notification'),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     */
-    public function content(): Content
-    {
-        return new Content(
-            markdown: 'mail.markdown.checkin-accessory',
-            with:   [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-            ]
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Mail/CheckinAssetMail.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Helpers\Helper;
-use App\Models\Asset;
-use App\Models\Setting;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Queue\SerializesModels;
-
-class CheckinAssetMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $note)
-    {
-        $this->target = $checkedOutTo;
-        $this->item = $asset;
-        $this->admin = $checkedInBy;
-        $this->note = $note;
-
-        $this->settings = Setting::getSettings();
-        $this->expected_checkin = '';
-
-        if ($this->item->expected_checkin) {
-            $this->expected_checkin = Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
-                false);
-        }
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
-
-        return new Envelope(
-            from: $from,
-            subject: trans('mail.Asset_Checkin_Notification'),
-        );
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return Content
-     */
-    public function content(): Content
-    {
-        $this->item->load('assetstatus');
-        $fields = [];
-
-        // Check if the item has custom fields associated with it
-        if (($this->item->model) && ($this->item->model->fieldset)) {
-            $fields = $this->item->model->fieldset->fields;
-        }
-
-        return new Content(
-            markdown: 'mail.markdown.checkin-asset',
-            with:  [
-                'item'          => $this->item,
-                'status'        => $this->item->assetstatus?->name,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'fields'        => $fields,
-                'expected_checkin'  => $this->expected_checkin,
-            ],
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Mail/CheckinLicenseMail.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\LicenseSeat;
-use App\Models\Setting;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class CheckinLicenseMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $checkedInBy, $note)
-    {
-        $this->target = $checkedOutTo;
-        $this->item = $licenseSeat;
-        $this->admin = $checkedInBy;
-        $this->note = $note;
-        $this->settings = Setting::getSettings();
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
-
-        return new Envelope(
-            from: $from,
-            subject: trans('mail.License_Checkin_Notification'),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     */
-    public function content(): Content
-    {
-        return new Content(
-            markdown: 'mail.markdown.checkin-license',
-            with:   [
-                'license_seat'  => $this->item,
-                'license'       => $this->item->license,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-            ]
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Mail/CheckoutAccessoryMail.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\Accessory;
-use App\Models\Setting;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class CheckoutAccessoryMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOutBy,$note, $acceptance)
-    {
-        $this->item = $accessory;
-        $this->admin = $checkedOutBy;
-        $this->note = $note;
-        $this->checkout_qty = $accessory->checkout_qty;
-        $this->target = $checkedOutTo;
-        $this->acceptance = $acceptance;
-        $this->settings = Setting::getSettings();
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
-
-        return new Envelope(
-            from: $from,
-            subject: (trans('mail.Accessory_Checkout_Notification')),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     */
-    public function content(): Content
-    {
-        Log::debug($this->item->getImageUrl());
-        $eula = $this->item->getEula();
-        $req_accept = $this->item->requireAcceptance();
-        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
-
-        return new Content(
-            markdown: 'mail.markdown.checkout-accessory',
-            with:   [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'eula'          => $eula,
-                'req_accept'    => $req_accept,
-                'accept_url'    => $accept_url,
-                'checkout_qty'  => $this->checkout_qty,
-            ],
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Mail/CheckoutAssetMail.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Helpers\Helper;
-use App\Models\Asset;
-use App\Models\Setting;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Attachment;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Queue\SerializesModels;
-
-class CheckoutAssetMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $note, $acceptance)
-    {
-        $this->item = $asset;
-        $this->admin = $checkedOutBy;
-        $this->note = $note;
-        $this->target = $checkedOutTo;
-        $this->acceptance = $acceptance;
-
-        $this->settings = Setting::getSettings();
-
-        $this->last_checkout = '';
-        $this->expected_checkin = '';
-
-        if ($this->item->last_checkout) {
-            $this->last_checkout = Helper::getFormattedDateObject($this->item->last_checkout, 'date',
-                false);
-        }
-
-        if ($this->item->expected_checkin) {
-            $this->expected_checkin = Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
-                false);
-        }
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        $from = new Address(env('MAIL_FROM_ADDR', 'service@snipe-it.io'));
-
-        return new Envelope(
-            from: $from,
-            subject: trans('mail.Asset_Checkout_Notification'),
-        );
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return Content
-     */
-    public function content(): Content
-    {
-        $this->item->load('assetstatus');
-        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
-        $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
-        $fields = [];
-
-        // Check if the item has custom fields associated with it
-        if (($this->item->model) && ($this->item->model->fieldset)) {
-            $fields = $this->item->model->fieldset->fields;
-        }
-
-        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
-
-        return new Content(
-            markdown: 'mail.markdown.checkout-asset',
-            with:  [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'status'        => $this->item->assetstatus?->name,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'fields'        => $fields,
-                'eula'          => $eula,
-                'req_accept'    => $req_accept,
-                'accept_url'    => $accept_url,
-                'last_checkout' => $this->last_checkout,
-                'expected_checkin'  => $this->expected_checkin,
-            ],
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Mail/CheckoutConsumableMail.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\Consumable;
-use App\Models\Setting;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-
-class CheckoutConsumableMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(Consumable $consumable, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
-    {
-        $this->item = $consumable;
-        $this->admin = $checkedOutBy;
-        $this->note = $note;
-        $this->target = $checkedOutTo;
-        $this->acceptance = $acceptance;
-        $this->qty = $consumable->checkout_qty;
-
-        $this->settings = Setting::getSettings();
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
-
-        return new Envelope(
-            from: $from,
-            subject: trans('mail.Confirm_consumable_delivery'),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     */
-    public function content(): Content
-    {
-
-        $eula = $this->item->getEula();
-        $req_accept = $this->item->requireAcceptance();
-
-        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
-
-        return new Content(
-            markdown: 'mail.markdown.checkout-consumable',
-            with:   [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'eula'          => $eula,
-                'req_accept'    => $req_accept,
-                'accept_url'    => $accept_url,
-                'qty'           => $this->qty,
-            ]
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Mail/CheckoutLicenseMail.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\LicenseSeat;
-use App\Models\Setting;
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Address;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class CheckoutLicenseMail extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
-    {
-        $this->item = $licenseSeat;
-        $this->admin = $checkedOutBy;
-        $this->note = $note;
-        $this->target = $checkedOutTo;
-        $this->acceptance = $acceptance;
-
-        $this->settings = Setting::getSettings();
-    }
-
-    /**
-     * Get the message envelope.
-     */
-    public function envelope(): Envelope
-    {
-        $from = new Address(env('MAIL_FROM_ADDR','service@snipe-it.io'));
-
-        return new Envelope(
-            from: $from,
-            subject: trans('mail.Confirm_license_delivery'),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     */
-    public function content(): Content
-    {
-        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
-        $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
-
-        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
-        return new Content(
-            markdown: 'mail.markdown.checkout-license',
-            with:   [
-                'license_seat'  => $this->item,
-                'license'       => $this->item->license,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'eula'          => $eula,
-                'req_accept'    => $req_accept,
-                'accept_url'    => $accept_url,
-            ]
-        );
-    }
-
-    /**
-     * Get the attachments for the message.
-     *
-     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
-     */
-    public function attachments(): array
-    {
-        return [];
-    }
-}

app/Models/Actionlog.php

@@ -55,8 +55,6 @@ class Actionlog extends SnipeModel
         'created_by',
         'remote_ip',
         'user_agent',
-        'item_type',
-        'target_type',
         'action_source'
     ];
 
@@ -66,10 +64,10 @@ class Actionlog extends SnipeModel
      * @var array
      */
     protected $searchableRelations = [
-        'company'     => ['name'],
-        'adminuser'   => ['first_name','last_name','username', 'email'],
-        'user'        => ['first_name','last_name','username', 'email'],
-        'assets'      => ['asset_tag','name'],
+        'company' => ['name'],
+        'adminuser' => ['first_name','last_name','username', 'email'],
+        'user'  => ['first_name','last_name','username', 'email'],
+        'assets'  => ['asset_tag','name'],
     ];
 
     /**

app/Models/Asset.php

@@ -301,9 +301,9 @@ class Asset extends Depreciable
         // This asset is not currently assigned to anyone and is not deleted...
         if ((! $this->assigned_to) && (! $this->deleted_at)) {
 
-            // The asset status is not archived and is deployable
-            if (($this->assetstatus) && ($this->assetstatus->archived == '0')
-                && ($this->assetstatus->deployable == '1'))
+            // The asset is not archived and the status is deployable
+            if (($this->assetstatus) && ($this->archived == '0')
+                && ($this->assetstatus->status_type == 'deployable'))
             {
                 return true;
 
@@ -1146,9 +1146,7 @@ class Asset extends Depreciable
     public function scopePending($query)
     {
         return $query->whereHas('assetstatus', function ($query) {
-            $query->where('deployable', '=', 0)
-                ->where('pending', '=', 1)
-                ->where('archived', '=', 0);
+            $query->where('status_type', '=', 'deployable');
         });
     }
 
@@ -1195,9 +1193,7 @@ class Asset extends Depreciable
     {
         return $query->whereNull('assets.assigned_to')
                    ->whereHas('assetstatus', function ($query) {
-                       $query->where('deployable', '=', 1)
-                             ->where('pending', '=', 0)
-                             ->where('archived', '=', 0);
+                       $query->where('status_type', '=', 'deployable');
                    });
     }
 
@@ -1212,9 +1208,7 @@ class Asset extends Depreciable
     public function scopeUndeployable($query)
     {
         return $query->whereHas('assetstatus', function ($query) {
-            $query->where('deployable', '=', 0)
-                ->where('pending', '=', 0)
-                ->where('archived', '=', 0);
+            $query->where('status_type', '!=', 'deployable');
         });
     }
 
@@ -1229,7 +1223,7 @@ class Asset extends Depreciable
     public function scopeNotArchived($query)
     {
         return $query->whereHas('assetstatus', function ($query) {
-            $query->where('archived', '=', 0);
+            $query->where('status_type', '!=', 'archived');
         });
     }
 
@@ -1406,9 +1400,7 @@ class Asset extends Depreciable
     public function scopeArchived($query)
     {
         return $query->whereHas('assetstatus', function ($query) {
-            $query->where('deployable', '=', 0)
-                ->where('pending', '=', 0)
-                ->where('archived', '=', 1);
+            $query->where('status_type', '=', 'archived');
         });
     }
 
@@ -1440,9 +1432,8 @@ class Asset extends Depreciable
         return Company::scopeCompanyables($query->where($table.'.requestable', '=', 1))
         ->whereHas('assetstatus', function ($query) {
             $query->where(function ($query) {
-                $query->where('deployable', '=', 1)
-                      ->where('archived', '=', 0); // you definitely can't request something that's archived
-            })->orWhere('pending', '=', 1); // we've decided that even though an asset may be 'pending', you can still request it
+                $query->where('status_type', '!=', 'archived'); // you definitely can't request something that's archived
+            }); // we've decided that even though an asset may be 'pending', you can still request it
         });
     }
 

app/Models/AssetModel.php

@@ -68,7 +68,6 @@ class AssetModel extends SnipeModel
         'model_number',
         'name',
         'notes',
-        'requestable',
     ];
 
     use Searchable;
@@ -329,14 +328,4 @@ class AssetModel extends SnipeModel
     {
         return $query->leftJoin('custom_fieldsets', 'models.fieldset_id', '=', 'custom_fieldsets.id')->orderBy('custom_fieldsets.name', $order);
     }
-
-    /**
-     * Query builder scope to order on created_by name
-     *
-     */
-    public function scopeOrderByCreatedByName($query, $order)
-    {
-        return $query->leftJoin('users as admin_sort', 'models.created_by', '=', 'admin_sort.id')->select('models.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
-    }
-
 }

app/Models/Import.php

@@ -14,16 +14,4 @@ class Import extends Model
         'first_row' => 'array',
         'field_map' => 'json',
     ];
-
-    /**
-     * Establishes the license -> admin user relationship
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since [v2.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function adminuser()
-    {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
-    }
 }

app/Models/License.php

@@ -184,7 +184,7 @@ class License extends Depreciable
             $logAction->item_type = self::class;
             $logAction->item_id = $license->id;
             $logAction->created_by = auth()->id() ?: 1; // We don't have an id while running the importer from CLI.
-            $logAction->note = "deleted {$change} seats";
+            $logAction->note = "deleted ${change} seats";
             $logAction->target_id = null;
             $logAction->logaction('delete seats');
 
@@ -216,7 +216,7 @@ class License extends Depreciable
             $logAction->item_type = self::class;
             $logAction->item_id = $license->id;
             $logAction->created_by = auth()->id() ?: 1; // Importer.
-            $logAction->note = "added {$change} seats";
+            $logAction->note = "added ${change} seats";
             $logAction->target_id = null;
             $logAction->logaction('add seats');
         }
@@ -743,4 +743,4 @@ class License extends Depreciable
     {
         return $query->leftJoin('users as admin_sort', 'licenses.created_by', '=', 'admin_sort.id')->select('licenses.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
     }
-}
+}

app/Models/Location.php

@@ -138,9 +138,7 @@ class Location extends SnipeModel
     {
         return $this->hasMany(\App\Models\Asset::class, 'location_id')
             ->whereHas('assetstatus', function ($query) {
-                $query->where('status_labels.deployable', '=', 1)
-                        ->orWhere('status_labels.pending', '=', 1)
-                        ->orWhere('status_labels.archived', '=', 0);
+                $query->whereNot('status_labels.status_type', '=', 'archived');
             });
     }
 

app/Models/Recipients/AdminRecipient.php

@@ -6,15 +6,9 @@ use App\Models\Setting;
 
 class AdminRecipient extends Recipient
 {
-
-    protected $email;
     public function __construct()
     {
         $settings = Setting::getSettings();
         $this->email = trim($settings->admin_cc_email);
     }
-    
-    public function getEmail(){
-        return $this->email;
-    }
 }

app/Models/Statuslabel.php

@@ -23,17 +23,16 @@ class Statuslabel extends SnipeModel
     protected $rules = [
         'name'  => 'required|string|unique_undeleted',
         'notes'   => 'string|nullable',
-        'deployable' => 'required',
-        'pending' => 'required',
-        'archived' => 'required',
+        'status_type' => 'required|in:deployable,pending,archived,undeployable1',
     ];
 
     protected $fillable = [
-        'archived',
-        'deployable',
+        'status_type',
         'name',
         'notes',
-        'pending',
+        'color',
+        'show_in_nav',
+        'default_label',
     ];
 
     use Searchable;
@@ -76,54 +75,6 @@ class Statuslabel extends SnipeModel
      * @since [v1.0]
      * @return string
      */
-    public function getStatuslabelType()
-    {
-        if (($this->pending == '1') && ($this->archived == '0') && ($this->deployable == '0')) {
-            return 'pending';
-        } elseif (($this->pending == '0') && ($this->archived == '1') && ($this->deployable == '0')) {
-            return 'archived';
-        } elseif (($this->pending == '0') && ($this->archived == '0') && ($this->deployable == '0')) {
-            return 'undeployable';
-        }
-
-        return 'deployable';
-    }
-
-    /**
-     * Query builder scope to for pending status types
-     *
-     * @return \Illuminate\Database\Query\Builder Modified query builder
-     */
-    public function scopePending()
-    {
-        return $this->where('pending', '=', 1)
-                    ->where('archived', '=', 0)
-                    ->where('deployable', '=', 0);
-    }
-
-    /**
-     * Query builder scope for archived status types
-     *
-     * @return \Illuminate\Database\Query\Builder Modified query builder
-     */
-    public function scopeArchived()
-    {
-        return $this->where('pending', '=', 0)
-            ->where('archived', '=', 1)
-            ->where('deployable', '=', 0);
-    }
-
-    /**
-     * Query builder scope for deployable status types
-     *
-     * @return \Illuminate\Database\Query\Builder Modified query builder
-     */
-    public function scopeDeployable()
-    {
-        return $this->where('pending', '=', 0)
-            ->where('archived', '=', 0)
-            ->where('deployable', '=', 1);
-    }
 
     /**
      * Query builder scope for undeployable status types
@@ -132,40 +83,10 @@ class Statuslabel extends SnipeModel
      */
     public function scopeUndeployable()
     {
-        return $this->where('pending', '=', 0)
-            ->where('archived', '=', 0)
-            ->where('deployable', '=', 0);
+        return $this->whereNot('status_type', '=', 'deployable');
     }
 
-    /**
-     * Helper function to determine type attributes
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since [v1.0]
-     * @return string
-     */
-    public static function getStatuslabelTypesForDB($type)
-    {
-        $statustype['pending'] = 0;
-        $statustype['deployable'] = 0;
-        $statustype['archived'] = 0;
 
-        if ($type == 'pending') {
-            $statustype['pending'] = 1;
-            $statustype['deployable'] = 0;
-            $statustype['archived'] = 0;
-        } elseif ($type == 'deployable') {
-            $statustype['pending'] = 0;
-            $statustype['deployable'] = 1;
-            $statustype['archived'] = 0;
-        } elseif ($type == 'archived') {
-            $statustype['pending'] = 0;
-            $statustype['deployable'] = 0;
-            $statustype['archived'] = 1;
-        }
-
-        return $statustype;
-    }
 
     public function scopeOrderByCreatedBy($query, $order)
     {

app/Notifications/CheckinAccessoryNotification.php

@@ -6,11 +6,9 @@ use App\Models\Accessory;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -57,9 +55,22 @@ class CheckinAccessoryNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = SlackWebhookChannel::class;
+            $notifyBy[] = 'slack';
         }
 
+        /**
+         * Only send notifications to users that have email addresses
+         */
+        if ($this->target instanceof User && $this->target->email != '') {
+            Log::debug('The target is a user');
+
+            if ($this->item->checkin_email()) {
+                $notifyBy[] = 'mail';
+            }
+        }
+
+        Log::debug('checkin_email on this category is '.$this->item->checkin_email());
+
         return $notifyBy;
     }
 
@@ -92,29 +103,18 @@ class CheckinAccessoryNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
-            return MicrosoftTeamsMessage::create()
-                ->to($this->settings->webhook_endpoint)
-                ->type('success')
-                ->addStartGroupToSection('activityTitle')
-                ->title(trans('Accessory_Checkin_Notification'))
-                ->addStartGroupToSection('activityText')
-                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
-                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
-                ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
-                ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
-                ->fact(trans('mail.notes'), $note ?: '');
-        }
 
-        $message = trans('mail.Accessory_Checkin_Notification');
-        $details = [
-            trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
-            trans('mail.Accessory_Checkin_Notification'). ' by' => $admin->present()->fullName(),
-            trans('admin/consumables/general.remaining')=> $item->numRemaining(),
-            trans('mail.notes') => $note ?: '',
-        ];
-        return  array($message, $details);
+        return MicrosoftTeamsMessage::create()
+            ->to($this->settings->webhook_endpoint)
+            ->type('success')
+            ->addStartGroupToSection('activityTitle')
+            ->title(trans('Accessory_Checkin_Notification'))
+            ->addStartGroupToSection('activityText')
+            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+            ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+            ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
+            ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
+            ->fact(trans('mail.notes'), $note ?: '');
     }
     public function toGoogleChat()
     {
@@ -142,4 +142,24 @@ class CheckinAccessoryNotification extends Notification
             );
 
     }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail()
+    {
+        Log::debug('to email called');
+
+        return (new MailMessage)->markdown('notifications.markdown.checkin-accessory',
+            [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+            ])
+            ->subject(trans('mail.Accessory_Checkin_Notification'));
+    }
 }

app/Notifications/CheckinAssetNotification.php

@@ -7,11 +7,9 @@ use App\Models\Asset;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -52,6 +50,7 @@ class CheckinAssetNotification extends Notification
      */
     public function via()
     {
+        $notifyBy = [];
         if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
@@ -63,7 +62,15 @@ class CheckinAssetNotification extends Notification
         }
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
             Log::debug('use webhook');
-            $notifyBy[] = SlackWebhookChannel::class;
+            $notifyBy[] = 'slack';
+        }
+
+        /**
+         * Only send checkin notifications to users if the category
+         * has the corresponding checkbox checked.
+         */
+        if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') {
+            $notifyBy[] = 'mail';
         }
 
         return $notifyBy;
@@ -99,30 +106,16 @@ class CheckinAssetNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
-            return MicrosoftTeamsMessage::create()
-                ->to($this->settings->webhook_endpoint)
-                ->type('success')
-                ->title(trans('mail.Asset_Checkin_Notification'))
-                ->addStartGroupToSection('activityText')
-                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
-                ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName())
-                ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
-                ->fact(trans('mail.notes'), $note ?: '');
-        }
-
-
-        $message = trans('mail.Asset_Checkin_Notification');
-        $details = [
-            trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
-            trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(),
-            trans('admin/hardware/form.status') => $item->assetstatus->name,
-            trans('mail.notes') => $note ?: '',
-        ];
-
-        return  array($message, $details);
+        return MicrosoftTeamsMessage::create()
+            ->to($this->settings->webhook_endpoint)
+            ->type('success')
+            ->title(trans('mail.Asset_Checkin_Notification'))
+            ->addStartGroupToSection('activityText')
+            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
+            ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+            ->fact(trans('mail.Asset_Checkin_Notification')." by ", $admin->present()->fullName())
+            ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
+            ->fact(trans('mail.notes'), $note ?: '');
     }
     public function toGoogleChat()
     {
@@ -149,5 +142,35 @@ class CheckinAssetNotification extends Notification
                         )
                     )
             );
+
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail()
+    {
+        $fields = [];
+
+        // Check if the item has custom fields associated with it
+        if (($this->item->model) && ($this->item->model->fieldset)) {
+            $fields = $this->item->model->fieldset->fields;
+        }
+
+        $message = (new MailMessage)->markdown('notifications.markdown.checkin-asset',
+            [
+                'item'          => $this->item,
+                'status'        => $this->item->assetstatus?->name,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'fields'        => $fields,
+                'expected_checkin'  => $this->expected_checkin,
+            ])
+            ->subject(trans('mail.Asset_Checkin_Notification'));
+
+        return $message;
     }
 }

app/Notifications/CheckinLicenseSeatNotification.php

@@ -6,11 +6,9 @@ use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -60,7 +58,15 @@ class CheckinLicenseSeatNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = SlackWebhookChannel::class;
+            $notifyBy[] = 'slack';
+        }
+
+        /**
+         * Only send checkin notifications to users if the category
+         * has the corresponding checkbox checked.
+         */
+        if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') {
+            $notifyBy[] = 'mail';
         }
 
         return $notifyBy;
@@ -103,30 +109,18 @@ class CheckinLicenseSeatNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
-            return MicrosoftTeamsMessage::create()
-                ->to($this->settings->webhook_endpoint)
-                ->type('success')
-                ->addStartGroupToSection('activityTitle')
-                ->title(trans('mail.License_Checkin_Notification'))
-                ->addStartGroupToSection('activityText')
-                ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
-                ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
-                ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
-                ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
-                ->fact(trans('mail.notes'), $note ?: '');
-        }
 
-        $message = trans('mail.License_Checkin_Notification');
-        $details = [
-            trans('mail.checkedin_from')=> $target->present()->fullName(),
-            trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.License_Checkin_Notification')." by " => $admin->present()->fullName() ?: 'CLI tool',
-            trans('admin/consumables/general.remaining') => $item->availCount()->count(),
-            trans('mail.notes') => $note ?: '',
-        ];
-
-        return  array($message, $details);
+        return MicrosoftTeamsMessage::create()
+            ->to($this->settings->webhook_endpoint)
+            ->type('success')
+            ->addStartGroupToSection('activityTitle')
+            ->title(trans('mail.License_Checkin_Notification'))
+            ->addStartGroupToSection('activityText')
+            ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
+            ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
+            ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
+            ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
+            ->fact(trans('mail.notes'), $note ?: '');
     }
     public function toGoogleChat()
     {
@@ -155,4 +149,23 @@ class CheckinLicenseSeatNotification extends Notification
             );
 
     }
+
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail()
+    {
+        return (new MailMessage)->markdown('notifications.markdown.checkin-license',
+            [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+            ])
+            ->subject(trans('mail.License_Checkin_Notification'));
+    }
 }

app/Notifications/CheckoutAccessoryNotification.php

@@ -9,7 +9,6 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -121,7 +120,6 @@ class CheckoutAccessoryNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
             return MicrosoftTeamsMessage::create()
                 ->to($this->settings->webhook_endpoint)
                 ->type('success')
@@ -135,19 +133,7 @@ class CheckoutAccessoryNotification extends Notification
                 ->fact(trans('mail.Accessory_Checkout_Notification') . " by ", $admin->present()->fullName())
                 ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
                 ->fact(trans('mail.notes'), $note ?: '');
-        }
 
-        $message = trans('mail.Accessory_Checkout_Notification');
-        $details = [
-            trans('mail.assigned_to') => $target->present()->name,
-            trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
-            trans('general.qty') => $this->checkout_qty,
-            trans('mail.checkedout_from') => $item->location->name ? $item->location->name : '',
-            trans('mail.Accessory_Checkout_Notification'). ' by' => $admin->present()->fullName(),
-            trans('admin/consumables/general.remaining')=> $item->numRemaining(),
-            trans('mail.notes') => $note ?: '',
-        ];
-        return  array($message, $details);
     }
     public function toGoogleChat()
     {

app/Notifications/CheckoutAssetNotification.php

@@ -8,10 +8,9 @@ use App\Models\Setting;
 use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Channels\SlackWebhookChannel;
+use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\Enums\Icon;
 use NotificationChannels\GoogleChat\Enums\ImageStyle;
@@ -22,9 +21,6 @@ use NotificationChannels\GoogleChat\Widgets\KeyValue;
 use NotificationChannels\MicrosoftTeams\MicrosoftTeamsChannel;
 use NotificationChannels\MicrosoftTeams\MicrosoftTeamsMessage;
 use Illuminate\Support\Facades\Log;
-use Osama\LaravelTeamsNotification\Logging\TeamsLoggingChannel;
-use Osama\LaravelTeamsNotification\TeamsNotification;
-
 class CheckoutAssetNotification extends Notification
 {
     use Queueable;
@@ -36,11 +32,14 @@ class CheckoutAssetNotification extends Notification
      */
     public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
     {
-        $this->settings = Setting::getSettings();
         $this->item = $asset;
         $this->admin = $checkedOutBy;
         $this->note = $note;
         $this->target = $checkedOutTo;
+        $this->acceptance = $acceptance;
+
+        $this->settings = Setting::getSettings();
+
         $this->last_checkout = '';
         $this->expected_checkin = '';
 
@@ -54,6 +53,7 @@ class CheckoutAssetNotification extends Notification
                 false);
         }
     }
+
     /**
      * Get the notification's delivery channels.
      *
@@ -62,34 +62,61 @@ class CheckoutAssetNotification extends Notification
     public function via()
     {
         $notifyBy = [];
-
-        if (Setting::getSettings()->webhook_selected === 'google' && Setting::getSettings()->webhook_endpoint) {
+        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_selected === 'microsoft' && Setting::getSettings()->webhook_endpoint) {
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
-            $notifyBy[] = TeamsNotification::class;
+            $notifyBy[] = MicrosoftTeamsChannel::class;
         }
 
 
-        if (Setting::getSettings()->webhook_selected === 'slack' || Setting::getSettings()->webhook_selected === 'general' ) {
+        if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
 
             Log::debug('use webhook');
-            $notifyBy[] = SlackWebhookChannel::class;
+            $notifyBy[] = 'slack';
+        }
+
+        /**
+         * Only send notifications to users that have email addresses
+         */
+        if ($this->target instanceof User && $this->target->email != '') {
+
+            /**
+             * Send an email if the asset requires acceptance,
+             * so the user can accept or decline the asset
+             */
+            if ($this->item->requireAcceptance()) {
+                $notifyBy[1] = 'mail';
+            }
+
+            /**
+             * Send an email if the item has a EULA, since the user should always receive it
+             */
+            if ($this->item->getEula()) {
+                $notifyBy[1] = 'mail';
+            }
+
+            /**
+             * Send an email if an email should be sent at checkin/checkout
+             */
+            if ($this->item->checkin_email()) {
+                $notifyBy[1] = 'mail';
+            }
         }
 
         return $notifyBy;
     }
 
-    public function toSlack() :SlackMessage
+    public function toSlack()
     {
         $target = $this->target;
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->webhook_botname) ?: 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
@@ -97,7 +124,7 @@ class CheckoutAssetNotification extends Notification
             'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
         ];
 
-        if (($this->expected_checkin) && ($this->expected_checkin !== '')) {
+        if (($this->expected_checkin) && ($this->expected_checkin != '')) {
             $fields['Expected Checkin'] = $this->expected_checkin;
         }
 
@@ -111,7 +138,6 @@ class CheckoutAssetNotification extends Notification
                     ->content($note);
             });
     }
-
     public function toMicrosoftTeams()
     {
         $target = $this->target;
@@ -119,26 +145,17 @@ class CheckoutAssetNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
-            return MicrosoftTeamsMessage::create()
-                ->to($this->settings->webhook_endpoint)
-                ->type('success')
-                ->title(trans('mail.Asset_Checkout_Notification'))
-                ->addStartGroupToSection('activityText')
-                ->fact(trans('mail.assigned_to'), $target->present()->name)
-                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-                ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->present()->fullName())
-                ->fact(trans('mail.notes'), $note ?: '');
-        }
+        return MicrosoftTeamsMessage::create()
+            ->to($this->settings->webhook_endpoint)
+            ->type('success')
+            ->title(trans('mail.Asset_Checkout_Notification'))
+            ->addStartGroupToSection('activityText')
+            ->fact(trans('mail.assigned_to'), $target->present()->name)
+            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
+            ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->present()->fullName())
+            ->fact(trans('mail.notes'), $note ?: '');
+
 
-        $message = trans('mail.Asset_Checkout_Notification');
-        $details = [
-            trans('mail.assigned_to') => $target->present()->name,
-            trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.Asset_Checkout_Notification'). ' by' => $admin->present()->fullName(),
-            trans('mail.notes') => $note ?: '',
-        ];
-       return  array($message, $details);
     }
 public function toGoogleChat()
     {
@@ -167,4 +184,42 @@ public function toGoogleChat()
             );
 
     }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail()
+    {   $this->item->load('assetstatus');
+        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
+        $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
+        $fields = [];
+
+        // Check if the item has custom fields associated with it
+        if (($this->item->model) && ($this->item->model->fieldset)) {
+            $fields = $this->item->model->fieldset->fields;
+        }
+
+        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
+
+        $message = (new MailMessage)->markdown('notifications.markdown.checkout-asset',
+            [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'status'        => $this->item->assetstatus?->name,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'fields'        => $fields,
+                'eula'          => $eula,
+                'req_accept'    => $req_accept,
+                'accept_url'    => $accept_url,
+                'last_checkout' => $this->last_checkout,
+                'expected_checkin'  => $this->expected_checkin,
+            ])
+            ->subject(trans('mail.Confirm_asset_delivery'));
+
+        return $message;
+    }
 }

app/Notifications/CheckoutConsumableNotification.php

@@ -6,11 +6,9 @@ use App\Models\Consumable;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -64,7 +62,35 @@ class CheckoutConsumableNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = SlackWebhookChannel::class;
+            $notifyBy[] = 'slack';
+        }
+
+        /**
+         * Only send notifications to users that have email addresses
+         */
+        if ($this->target instanceof User && $this->target->email != '') {
+
+            /**
+             * Send an email if the asset requires acceptance,
+             * so the user can accept or decline the asset
+             */
+            if ($this->item->requireAcceptance()) {
+                $notifyBy[1] = 'mail';
+            }
+
+            /**
+             * Send an email if the item has a EULA, since the user should always receive it
+             */
+            if ($this->item->getEula()) {
+                $notifyBy[1] = 'mail';
+            }
+
+            /**
+             * Send an email if an email should be sent at checkin/checkout
+             */
+            if ((method_exists($this->item, 'checkin_email')) && ($this->item->checkin_email())) {
+                $notifyBy[1] = 'mail';
+            }
         }
 
         return $notifyBy;
@@ -101,30 +127,17 @@ class CheckoutConsumableNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
-            return MicrosoftTeamsMessage::create()
-                ->to($this->settings->webhook_endpoint)
-                ->type('success')
-                ->addStartGroupToSection('activityTitle')
-                ->title(trans('mail.Consumable_checkout_notification'))
-                ->addStartGroupToSection('activityText')
-                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
-                ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->present()->fullName())
-                ->fact(trans('mail.assigned_to'), $target->present()->fullName())
-                ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
-                ->fact(trans('mail.notes'), $note ?: '');
-        }
-
-        $message = trans('mail.Consumable_checkout_notification');
-        $details = [
-            trans('mail.assigned_to') => $target->present()->fullName(),
-            trans('mail.item') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.Consumable_checkout_notification').' by' => $admin->present()->fullName(),
-            trans('admin/consumables/general.remaining') => $item->numRemaining(),
-            trans('mail.notes') => $note ?: '',
-        ];
-
-        return  array($message, $details);
+        return MicrosoftTeamsMessage::create()
+            ->to($this->settings->webhook_endpoint)
+            ->type('success')
+            ->addStartGroupToSection('activityTitle')
+            ->title(trans('mail.Consumable_checkout_notification'))
+            ->addStartGroupToSection('activityText')
+            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+            ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->present()->fullName())
+            ->fact(trans('mail.assigned_to'), $target->present()->fullName())
+            ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
+            ->fact(trans('mail.notes'), $note ?: '');
     }
     public function toGoogleChat()
     {
@@ -153,4 +166,30 @@ class CheckoutConsumableNotification extends Notification
             );
 
     }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail()
+    {
+        $eula = $this->item->getEula();
+        $req_accept = $this->item->requireAcceptance();
+
+        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
+
+        return (new MailMessage)->markdown('notifications.markdown.checkout-consumable',
+            [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'eula'          => $eula,
+                'req_accept'    => $req_accept,
+                'accept_url'    => $accept_url,
+                'qty'           => $this->qty,
+            ])
+            ->subject(trans('mail.Confirm_consumable_delivery'));
+    }
 }

app/Notifications/CheckoutLicenseSeatNotification.php

@@ -6,11 +6,9 @@ use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -62,7 +60,35 @@ class CheckoutLicenseSeatNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = SlackWebhookChannel::class;
+            $notifyBy[] = 'slack';
+        }
+
+        /**
+         * Only send notifications to users that have email addresses
+         */
+        if ($this->target instanceof User && $this->target->email != '') {
+
+            /**
+             * Send an email if the asset requires acceptance,
+             * so the user can accept or decline the asset
+             */
+            if ($this->item->requireAcceptance()) {
+                $notifyBy[1] = 'mail';
+            }
+
+            /**
+             * Send an email if the item has a EULA, since the user should always receive it
+             */
+            if ($this->item->getEula()) {
+                $notifyBy[1] = 'mail';
+            }
+
+            /**
+             * Send an email if an email should be sent at checkin/checkout
+             */
+            if ($this->item->checkin_email()) {
+                $notifyBy[1] = 'mail';
+            }
         }
 
         return $notifyBy;
@@ -99,29 +125,17 @@ class CheckoutLicenseSeatNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
-            return MicrosoftTeamsMessage::create()
-                ->to($this->settings->webhook_endpoint)
-                ->type('success')
-                ->addStartGroupToSection('activityTitle')
-                ->title(trans('mail.License_Checkout_Notification'))
-                ->addStartGroupToSection('activityText')
-                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
-                ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->present()->fullName())
-                ->fact(trans('mail.assigned_to'), $target->present()->fullName())
-                ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
-                ->fact(trans('mail.notes'), $note ?: '');
-        }
-
-        $message = trans('mail.License_Checkout_Notification');
-        $details = [
-            trans('mail.assigned_to') => $target->present()->fullName(),
-            trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.License_Checkout_Notification').' by' => $admin->present()->fullName(),
-            trans('admin/consumables/general.remaining') => $item->availCount()->count(),
-            trans('mail.notes') => $note ?: '',
-        ];
-        return  array($message, $details);
+        return MicrosoftTeamsMessage::create()
+            ->to($this->settings->webhook_endpoint)
+            ->type('success')
+            ->addStartGroupToSection('activityTitle')
+            ->title(trans('mail.License_Checkout_Notification'))
+            ->addStartGroupToSection('activityText')
+            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+            ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->present()->fullName())
+            ->fact(trans('mail.assigned_to'), $target->present()->fullName())
+            ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
+            ->fact(trans('mail.notes'), $note ?: '');
     }
     public function toGoogleChat()
     {
@@ -150,4 +164,29 @@ class CheckoutLicenseSeatNotification extends Notification
             );
 
     }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail()
+    {
+        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
+        $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
+
+        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
+
+        return (new MailMessage)->markdown('notifications.markdown.checkout-license',
+            [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'eula'          => $eula,
+                'req_accept'    => $req_accept,
+                'accept_url'    => $accept_url,
+            ])
+            ->subject(trans('mail.Confirm_license_delivery'));
+    }
 }

app/Presenters/ActionlogPresenter.php

@@ -42,27 +42,27 @@ class ActionlogPresenter extends Presenter
         // User related icons
         if ($this->itemType() == 'user') {
 
-            if ($this->action_type == '2fa reset') {
+            if ($this->actionType()=='2fa reset') {
                 return 'fa-solid fa-mobile-screen';
             }
 
-            if ($this->action_type == 'create new') {
+            if ($this->actionType()=='create new') {
                 return 'fa-solid fa-user-plus';
             }
 
-            if ($this->action_type == 'merged') {
+            if ($this->actionType()=='merged') {
                 return 'fa-solid fa-people-arrows';
             }
 
-            if ($this->action_type == 'delete') {
+            if ($this->actionType()=='delete') {
                 return 'fa-solid fa-user-minus';
             }
 
-            if ($this->action_type == 'delete') {
+            if ($this->actionType()=='delete') {
                 return 'fa-solid fa-user-minus';
             }
 
-            if ($this->action_type == 'update') {
+            if ($this->actionType()=='update') {
                 return 'fa-solid fa-user-pen';
             }
 
@@ -70,31 +70,31 @@ class ActionlogPresenter extends Presenter
         }
 
         // Everything else
-        if ($this->action_type == 'create new') {
+        if ($this->actionType()=='create new') {
             return 'fa-solid fa-plus';
         }
 
-        if ($this->action_type == 'delete') {
+        if ($this->actionType()=='delete') {
             return 'fa-solid fa-trash';
         }
 
-        if ($this->action_type == 'update') {
+        if ($this->actionType()=='update') {
             return 'fa-solid fa-pen';
         }
 
-        if ($this->action_type == 'restore') {
+        if ($this->actionType()=='restore') {
             return 'fa-solid fa-trash-arrow-up';
         }
 
-        if ($this->action_type == 'upload') {
+        if ($this->actionType()=='upload') {
             return 'fas fa-paperclip';
         }
 
-        if ($this->action_type == 'checkout') {
+        if ($this->actionType()=='checkout') {
             return 'fa-solid fa-rotate-left';
         }
 
-        if ($this->action_type == 'checkin from') {
+        if ($this->actionType()=='checkin from') {
             return 'fa-solid fa-rotate-right';
         }
 

app/Presenters/AssetPresenter.php

@@ -479,19 +479,6 @@ class AssetPresenter extends Presenter
         return $interval;
     }
 
-    /**
-     * @return string
-     * This handles the status label "meta" status of "deployed" if
-     * it's assigned. Should maybe deprecate.
-     */
-    public function statusMeta()
-    {
-        if ($this->model->assigned) {
-            return 'deployed';
-        }
-
-        return $this->model->assetstatus->getStatuslabelType();
-    }
 
     /**
      * @return string

app/Presenters/DepreciationReportPresenter.php

@@ -311,7 +311,7 @@ class DepreciationReportPresenter extends Presenter
         if ($this->model->assigned) {
             return 'deployed';
         }
-        return $this->model->assetstatus->getStatuslabelType();
+        return $this->model->assetstatus->status_type;
     }
 
     /**

app/Presenters/StatusLabelPresenter.php

@@ -30,9 +30,9 @@ class StatusLabelPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'statuslabelsAssetLinkFormatter',
             ],[
-                'field' => 'type',
-                'searchable' => false,
-                'sortable' => false,
+                'field' => 'status_type',
+                'searchable' => true,
+                'sortable' => true,
                 'switchable' => false,
                 'title' => trans('admin/statuslabels/table.status_type'),
                 'visible' => true,

app/Rules/AssetCannotBeCheckedOutToNondeployableStatus.php

@@ -40,7 +40,7 @@ class AssetCannotBeCheckedOutToNondeployableStatus implements DataAwareRule, Val
         // Check to see if any of the assign-ish fields are set
         if ((isset($this->data['assigned_to'])) || (isset($this->data['assigned_user'])) || (isset($this->data['assigned_location']))  || (isset($this->data['assigned_asset'])) || (isset($this->data['assigned_type']))) {
 
-            if (($value) && ($label = Statuslabel::find($value)) && ($label->getStatuslabelType()!='deployable')) {
+            if (($value) && ($label = Statuslabel::find($value)) && ($label->status_type!='deployable')) {
                 $fail(trans('admin/hardware/form.asset_not_deployable'));
             }
 

composer.json

@@ -38,7 +38,7 @@
     "intervention/image": "^2.5",
     "javiereguiluz/easyslugger": "^1.0",
     "laravel-notification-channels/google-chat": "^3.0",
-    "laravel-notification-channels/microsoft-teams": "^1.2",
+    "laravel-notification-channels/microsoft-teams": "^1.1",
     "laravel/framework": "^10.0",
     "laravel/helpers": "^1.4",
     "laravel/passport": "^11.0",
@@ -55,7 +55,6 @@
     "nunomaduro/collision": "^7.0",
     "okvpn/clock-lts": "^1.0",
     "onelogin/php-saml": "^3.4",
-    "osa-eg/laravel-teams-notification": "^2.1",
     "paragonie/constant_time_encoding": "^2.3",
     "paragonie/sodium_compat": "^1.19",
     "phpdocumentor/reflection-docblock": "^5.1",

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.0.14',
-  'full_app_version' => 'v7.0.14 - build 15942-g3bf33aa68',
-  'build_version' => '15942',
+  'app_version' => 'v7.0.13',
+  'full_app_version' => 'v7.0.13 - build 15666-g03b01689b',
+  'build_version' => '15666',
   'prerelease_version' => '',
-  'hash_version' => 'g3bf33aa68',
-  'full_hash' => 'v7.0.14-420-g3bf33aa68',
-  'branch' => 'master',
+  'hash_version' => 'g03b01689b',
+  'full_hash' => 'v7.0.13-144-g03b01689b',
+  'branch' => 'develop',
 );

database/factories/AssetFactory.php

@@ -34,7 +34,8 @@ class AssetFactory extends Factory
             'rtd_location_id' => Location::factory(),
             'serial' => $this->faker->uuid(),
             'status_id' => function () {
-                return Statuslabel::where('name', 'Ready to Deploy')->first() ?? Statuslabel::factory()->rtd()->create(['name' => 'Ready to Deploy']);
+                // $status = Statuslabel::factory()->create(); dd($status) ;
+                return Statuslabel::where('status_type', 'deployable')->first() ?? Statuslabel::factory()->create(['name' => 'Ready to Deploy', 'status_type' => 'deployable'])->id;
             },
             'created_by' => User::factory()->superuser(),
             'asset_tag' => $this->faker->unixTime('now'),

database/factories/ImportFactory.php

@@ -143,26 +143,4 @@ class ImportFactory extends Factory
             return $attributes;
         });
     }
-
-
-
-    /**
-     * Create an asset model import type.
-     *
-     * @return static
-     */
-    public function assetmodel()
-    {
-        return $this->state(function (array $attributes) {
-            $fileBuilder = Importing\AssetModelsImportFileBuilder::new();
-
-            $attributes['name'] = "{$attributes['name']} Asset Model";
-            $attributes['import_type'] = 'assetModel';
-            $attributes['header_row'] = $fileBuilder->toCsv()[0];
-            $attributes['first_row'] = $fileBuilder->firstRow();
-
-            return $attributes;
-        });
-    }
-
 }

database/factories/StatuslabelFactory.php

@@ -28,9 +28,7 @@ class StatuslabelFactory extends Factory
             'updated_at' => $this->faker->dateTime(),
             'created_by' => User::factory()->superuser(),
             'deleted_at' => null,
-            'deployable' => 0,
-            'pending' => 0,
-            'archived' => 0,
+            'status_type' => 'deployable',
             'notes' => '',
         ];
     }
@@ -40,7 +38,7 @@ class StatuslabelFactory extends Factory
         return $this->state(function () {
             return [
                 'notes' => $this->faker->sentence(),
-                'deployable' => 1,
+                'status_type' => 'deployable',
                 'default_label' => 1,
             ];
         });
@@ -56,7 +54,7 @@ class StatuslabelFactory extends Factory
         return $this->state(function () {
             return [
                 'notes' => $this->faker->sentence(),
-                'pending' => 1,
+                'status_type' => 'pending',
                 'default_label' => 1,
             ];
         });
@@ -67,8 +65,8 @@ class StatuslabelFactory extends Factory
         return $this->state(function () {
             return [
                 'notes' => 'These assets are permanently undeployable',
-                'archived' => 1,
                 'default_label' => 0,
+                'status_type' => 'archived',
             ];
         });
     }
@@ -79,6 +77,7 @@ class StatuslabelFactory extends Factory
             return [
                 'name' => 'Out for Diagnostics',
                 'default_label' => 0,
+                'status_type' => 'pending',
             ];
         });
     }
@@ -89,6 +88,7 @@ class StatuslabelFactory extends Factory
             return [
                 'name'      => 'Out for Repair',
                 'default_label' => 0,
+                'status_type' => 'pending',
             ];
         });
     }
@@ -99,6 +99,7 @@ class StatuslabelFactory extends Factory
             return [
                 'name'      => 'Broken - Not Fixable',
                 'default_label' => 0,
+                'status_type' => 'archived',
             ];
         });
     }
@@ -109,6 +110,7 @@ class StatuslabelFactory extends Factory
             return [
                 'name'      => 'Lost/Stolen',
                 'default_label' => 0,
+                'status_type' => 'archived',
             ];
         });
     }

database/migrations/2024_10_24_180042_add_type_to_status_labels.php

@@ -0,0 +1,71 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use App\Models\StatusLabel;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+
+        if (!Schema::hasColumn('status_labels', 'status_type')) {
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->string('status_type')->after('name')->default('deployable');
+            });
+
+            DB::table('status_labels')->where('pending', 1)->update(['status_type' => 'pending']);
+            DB::table('status_labels')->where('archived', 1)->update(['status_type' => 'archived']);
+            DB::table('status_labels')->where('deployable', 1)->update(['status_type' => 'deployable']);
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->renameColumn('deployable', 'legacy_deployable');
+            });
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->renameColumn('pending', 'legacy_pending');
+            });
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->renameColumn('archived', 'legacy_archived');
+            });
+        }
+
+
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+        if (Schema::hasColumn('status_labels', 'status_type')) {
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->dropColumn('status_type');
+            });
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->renameColumn('legacy_deployable', 'deployable');
+            });
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->renameColumn('legacy_pending', 'pending');
+            });
+
+            Schema::table('status_labels', function (Blueprint $table) {
+                $table->renameColumn('legacy_archived', 'archived');
+            });
+        }
+
+
+    }
+};

database/migrations/2024_11_06_211457_add_manager_indexes_to_location_and_user.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('locations', function (Blueprint $table) {
-            $table->index('manager_id');
-        });
-        Schema::table('users', function (Blueprint $table) {
-            $table->index('manager_id');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('locations', function (Blueprint $table) {
-            $table->dropIndex(['manager_id']);
-        });
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropIndex(['manager_id']);
-        });
-    }
-};

database/migrations/2024_11_07_113631_improve_manager_indexes_on_users_and_locations.php

@@ -1,39 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('locations', function (Blueprint $table) {
-            $table->dropIndex(['manager_id']);
-            $table->index(['manager_id','deleted_at']);
-        });
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropIndex(['manager_id']);
-            $table->index(['manager_id','deleted_at']);
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('locations', function (Blueprint $table) {
-            $table->dropIndex(['manager_id','deleted_at']);
-            $table->index(['manager_id']);
-        });
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropIndex(['manager_id','deleted_at']);
-            $table->index(['manager_id']);
-        });
-    }
-};

database/seeders/SettingsSeeder.php

@@ -37,6 +37,7 @@ class SettingsSeeder extends Seeder
         $settings->support_footer = 'on';
         $settings->pwd_secure_min = '8';
         $settings->default_avatar = 'default.png';
+        $settings->show_archived_in_list = 0;
         $settings->save();
 
         if ($user = User::where('username', '=', 'admin')->first()) {

database/seeders/StatuslabelSeeder.php

@@ -17,21 +17,27 @@ class StatuslabelSeeder extends Seeder
         Statuslabel::factory()->rtd()->create([
             'name' => 'Ready to Deploy',
             'created_by' => $admin->id,
+            'status_type' => 'deployable',
+            'legacy_deployable' => 1,
         ]);
 
         Statuslabel::factory()->pending()->create([
             'name' => 'Pending',
             'created_by' => $admin->id,
+            'status_type' => 'pending',
+            'legacy_pending' => 1,
         ]);
 
         Statuslabel::factory()->archived()->create([
             'name' => 'Archived',
             'created_by' => $admin->id,
+            'status_type' => 'archived',
+            'legacy_archived' => 1,
         ]);
 
-        Statuslabel::factory()->outForDiagnostics()->create(['created_by' => $admin->id]);
-        Statuslabel::factory()->outForRepair()->create(['created_by' => $admin->id]);
-        Statuslabel::factory()->broken()->create(['created_by' => $admin->id]);
-        Statuslabel::factory()->lost()->create(['created_by' => $admin->id]);
+        Statuslabel::factory()->outForDiagnostics()->pending()->create(['created_by' => $admin->id]);
+        Statuslabel::factory()->outForRepair()->pending()->create(['created_by' => $admin->id]);
+        Statuslabel::factory()->broken()->archived()->create(['created_by' => $admin->id]);
+        Statuslabel::factory()->lost()->archived()->create(['created_by' => $admin->id]);
     }
 }

package-lock.json

@@ -15,7 +15,7 @@
                 "bootstrap-colorpicker": "^2.5.3",
                 "bootstrap-datepicker": "^1.10.0",
                 "bootstrap-less": "^3.3.8",
-                "bootstrap-table": "1.23.5",
+                "bootstrap-table": "1.23.2",
                 "canvas-confetti": "^1.9.3",
                 "chart.js": "^2.9.4",
                 "clipboard": "^2.0.11",
@@ -26,7 +26,7 @@
                 "jquery-ui": "^1.14.0",
                 "jquery-validation": "^1.21.0",
                 "jquery.iframe-transport": "^1.0.0",
-                "jspdf-autotable": "^3.8.4",
+                "jspdf-autotable": "^3.8.3",
                 "less": "^4.2.0",
                 "less-loader": "^6.0",
                 "list.js": "^1.5.0",
@@ -37,7 +37,7 @@
                 "signature_pad": "^4.2.0",
                 "tableexport.jquery.plugin": "1.30.0",
                 "tether": "^1.4.0",
-                "webpack": "^5.95.0"
+                "webpack": "^5.94.0"
             },
             "devDependencies": {
                 "all-contributors-cli": "^6.26.1",
@@ -2105,28 +2105,10 @@
                 "@types/node": "*"
             }
         },
-        "node_modules/@types/eslint": {
-            "version": "9.6.1",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-            "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-            "dependencies": {
-                "@types/estree": "*",
-                "@types/json-schema": "*"
-            }
-        },
-        "node_modules/@types/eslint-scope": {
-            "version": "3.7.7",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-            "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-            "dependencies": {
-                "@types/eslint": "*",
-                "@types/estree": "*"
-            }
-        },
         "node_modules/@types/estree": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
         },
         "node_modules/@types/express": {
             "version": "4.17.21",
@@ -2485,9 +2467,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.14.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-            "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+            "version": "8.12.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+            "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -2502,6 +2484,14 @@
                 "acorn": "^8"
             }
         },
+        "node_modules/acorn-import-attributes": {
+            "version": "1.9.5",
+            "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+            "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+            "peerDependencies": {
+                "acorn": "^8"
+            }
+        },
         "node_modules/acorn-node": {
             "version": "1.8.2",
             "license": "Apache-2.0",
@@ -3688,9 +3678,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap-table": {
-            "version": "1.23.5",
-            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.23.5.tgz",
-            "integrity": "sha512-9WByoSpJvA73gi2YYIlX6IWR74oZtBmSixul/Th8FTBtBd/kZRpbKESGTjhA3BA3AYTnfyY8Iy1KeRWPlV2GWQ==",
+            "version": "1.23.2",
+            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.23.2.tgz",
+            "integrity": "sha512-1IFiWFZzbKlleXgYEHdwHkX6rxlQMEx2N1tA8rJK/j08pI+NjIGnxFeXUL26yQLQ0U135eis/BX3OV1+anY25g==",
             "peerDependencies": {
                 "jquery": "3"
             }
@@ -3950,9 +3940,7 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
-            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+            "version": "4.23.0",
             "funding": [
                 {
                     "type": "opencollective",
@@ -3967,11 +3955,12 @@
                     "url": "https://github.com/sponsors/ai"
                 }
             ],
+            "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001669",
-                "electron-to-chromium": "^1.5.41",
-                "node-releases": "^2.0.18",
-                "update-browserslist-db": "^1.1.1"
+                "caniuse-lite": "^1.0.30001587",
+                "electron-to-chromium": "^1.4.668",
+                "node-releases": "^2.0.14",
+                "update-browserslist-db": "^1.0.13"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -4078,9 +4067,7 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001677",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
-            "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
+            "version": "1.0.30001616",
             "funding": [
                 {
                     "type": "opencollective",
@@ -4094,7 +4081,8 @@
                     "type": "github",
                     "url": "https://github.com/sponsors/ai"
                 }
-            ]
+            ],
+            "license": "CC-BY-4.0"
         },
         "node_modules/canvas-confetti": {
             "version": "1.9.3",
@@ -5266,9 +5254,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.52",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.52.tgz",
-            "integrity": "sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ=="
+            "version": "1.4.756",
+            "license": "ISC"
         },
         "node_modules/elliptic": {
             "version": "6.5.5",
@@ -5401,9 +5388,8 @@
             "license": "MIT"
         },
         "node_modules/escalade": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "version": "3.1.2",
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -7181,9 +7167,9 @@
             }
         },
         "node_modules/jspdf-autotable": {
-            "version": "3.8.4",
-            "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.8.4.tgz",
-            "integrity": "sha512-rSffGoBsJYX83iTRv8Ft7FhqfgEL2nLpGAIiqruEQQ3e4r0qdLFbPUB7N9HAle0I3XgpisvyW751VHCqKUVOgQ==",
+            "version": "3.8.3",
+            "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.8.3.tgz",
+            "integrity": "sha512-PQFdljBt+ijm6ZWXYxhZ54A/awV63UKcipYoA2+YGsz0BXXiXTIL/FIg+V30j7wPdSdzClfbB3qKX9UeuFylPQ==",
             "peerDependencies": {
                 "jspdf": "^2.5.1"
             }
@@ -8111,9 +8097,8 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.18",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-            "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+            "version": "2.0.14",
+            "license": "MIT"
         },
         "node_modules/normalize-path": {
             "version": "3.0.0",
@@ -8564,9 +8549,8 @@
             "optional": true
         },
         "node_modules/picocolors": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+            "version": "1.0.0",
+            "license": "ISC"
         },
         "node_modules/picomatch": {
             "version": "2.3.1",
@@ -10719,9 +10703,7 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
-            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+            "version": "1.0.15",
             "funding": [
                 {
                     "type": "opencollective",
@@ -10736,9 +10718,10 @@
                     "url": "https://github.com/sponsors/ai"
                 }
             ],
+            "license": "MIT",
             "dependencies": {
-                "escalade": "^3.2.0",
-                "picocolors": "^1.1.0"
+                "escalade": "^3.1.2",
+                "picocolors": "^1.0.0"
             },
             "bin": {
                 "update-browserslist-db": "cli.js"
@@ -10883,17 +10866,17 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/webpack": {
-            "version": "5.96.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
-            "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+            "version": "5.94.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+            "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
             "dependencies": {
-                "@types/eslint-scope": "^3.7.7",
-                "@types/estree": "^1.0.6",
+                "@types/estree": "^1.0.5",
                 "@webassemblyjs/ast": "^1.12.1",
                 "@webassemblyjs/wasm-edit": "^1.12.1",
                 "@webassemblyjs/wasm-parser": "^1.12.1",
-                "acorn": "^8.14.0",
-                "browserslist": "^4.24.0",
+                "acorn": "^8.7.1",
+                "acorn-import-attributes": "^1.9.5",
+                "browserslist": "^4.21.10",
                 "chrome-trace-event": "^1.0.2",
                 "enhanced-resolve": "^5.17.1",
                 "es-module-lexer": "^1.2.1",

package.json

@@ -35,7 +35,7 @@
         "bootstrap-colorpicker": "^2.5.3",
         "bootstrap-datepicker": "^1.10.0",
         "bootstrap-less": "^3.3.8",
-        "bootstrap-table": "1.23.5",
+        "bootstrap-table": "1.23.2",
         "canvas-confetti": "^1.9.3",
         "chart.js": "^2.9.4",
         "clipboard": "^2.0.11",
@@ -46,7 +46,7 @@
         "jquery-ui": "^1.14.0",
         "jquery-validation": "^1.21.0",
         "jquery.iframe-transport": "^1.0.0",
-        "jspdf-autotable": "^3.8.4",
+        "jspdf-autotable": "^3.8.3",
         "less": "^4.2.0",
         "less-loader": "^6.0",
         "list.js": "^1.5.0",
@@ -57,6 +57,6 @@
         "signature_pad": "^4.2.0",
         "tableexport.jquery.plugin": "1.30.0",
         "tether": "^1.4.0",
-        "webpack": "^5.95.0"
+        "webpack": "^5.94.0"
     }
 }

public/css/dist/signature-pad.min.css

@@ -1 +1,135 @@
-#signature-pad{padding-top:250px;margin:auto}.m-signature-pad{position:relative;font-size:10px;width:100%;height:300px;border:1px solid #e8e8e8;background-color:#fff;box-shadow:0 1px 4px rgba(0,0,0,.27),0 0 40px rgba(0,0,0,.08) inset;border-radius:4px}.m-signature-pad:after,.m-signature-pad:before{position:absolute;z-index:-1;content:"";width:40%;height:10px;left:20px;bottom:10px;background:0 0;-webkit-transform:skew(-3deg) rotate(-3deg);-moz-transform:skew(-3deg) rotate(-3deg);-ms-transform:skew(-3deg) rotate(-3deg);-o-transform:skew(-3deg) rotate(-3deg);transform:skew(-3deg) rotate(-3deg);box-shadow:0 8px 12px rgba(0,0,0,.4)}.m-signature-pad:after{left:auto;right:20px;-webkit-transform:skew(3deg) rotate(3deg);-moz-transform:skew(3deg) rotate(3deg);-ms-transform:skew(3deg) rotate(3deg);-o-transform:skew(3deg) rotate(3deg);transform:skew(3deg) rotate(3deg)}.m-signature-pad--body{position:absolute;top:20px;bottom:60px;border:1px solid #f4f4f4;background-color:#fff}.m-signature-pad--body canvas{position:absolute;left:0;top:0;width:100%;height:100%;border-radius:4px;box-shadow:0 0 5px rgba(0,0,0,.02) inset}.m-signature-pad--footer{position:absolute;left:20px;right:20px;bottom:20px;height:40px}.m-signature-pad--footer .description{color:#c3c3c3;text-align:center;font-size:1.2em;margin-top:1.8em}.m-signature-pad--footer .button{position:absolute;bottom:0}.m-signature-pad--footer .button.clear{left:0}.m-signature-pad--footer .button.save{right:0}@media screen and (max-width:1024px){.m-signature-pad{top:0;left:0;right:0;bottom:0;width:auto;height:auto;min-width:250px;min-height:140px;margin:5%}}@media screen and (min-device-width:768px) and (max-device-width:1024px){.m-signature-pad{margin:10%}}@media screen and (max-height:320px){.m-signature-pad--body{left:0;right:0;top:0;bottom:32px}.m-signature-pad--footer{left:20px;right:20px;bottom:4px;height:28px}.m-signature-pad--footer .description{font-size:1em;margin-top:1em}}
+
+#signature-pad {
+  padding-top: 250px;
+  margin: auto;
+}
+.m-signature-pad {
+
+  position: relative;
+  font-size: 10px;
+  width: 100%;
+  height: 300px;
+  border: 1px solid #e8e8e8;
+  background-color: #fff;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.08) inset;
+  border-radius: 4px;
+}
+
+.m-signature-pad:before, .m-signature-pad:after {
+	position: absolute;
+  z-index: -1;
+  content: "";
+	width: 40%;
+	height: 10px;
+	left: 20px;
+	bottom: 10px;
+	background: transparent;
+	-webkit-transform: skew(-3deg) rotate(-3deg);
+	-moz-transform: skew(-3deg) rotate(-3deg);
+	-ms-transform: skew(-3deg) rotate(-3deg);
+	-o-transform: skew(-3deg) rotate(-3deg);
+	transform: skew(-3deg) rotate(-3deg);
+	box-shadow: 0 8px 12px rgba(0, 0, 0, 0.4);
+}
+
+.m-signature-pad:after {
+	left: auto;
+	right: 20px;
+	-webkit-transform: skew(3deg) rotate(3deg);
+	-moz-transform: skew(3deg) rotate(3deg);
+	-ms-transform: skew(3deg) rotate(3deg);
+	-o-transform: skew(3deg) rotate(3deg);
+	transform: skew(3deg) rotate(3deg);
+}
+
+.m-signature-pad--body {
+  position: absolute;
+  top: 20px;
+  bottom: 60px;
+  border: 1px solid #f4f4f4;
+  background-color: white;
+}
+
+.m-signature-pad--body
+  canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    border-radius: 4px;
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.02) inset;
+  }
+
+.m-signature-pad--footer {
+  position: absolute;
+  left: 20px;
+  right: 20px;
+  bottom: 20px;
+  height: 40px;
+}
+
+.m-signature-pad--footer
+  .description {
+    color: #C3C3C3;
+    text-align: center;
+    font-size: 1.2em;
+    margin-top: 1.8em;
+  }
+
+.m-signature-pad--footer
+  .button {
+    position: absolute;
+    bottom: 0;
+  }
+
+.m-signature-pad--footer
+  .button.clear {
+    left: 0;
+  }
+
+.m-signature-pad--footer
+  .button.save {
+    right: 0;
+  }
+
+@media screen and (max-width: 1024px) {
+  .m-signature-pad {
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: auto;
+    height: auto;
+    min-width: 250px;
+    min-height: 140px;
+    margin: 5%;
+  }
+
+}
+
+@media screen and (min-device-width: 768px) and (max-device-width: 1024px) {
+  .m-signature-pad {
+    margin: 10%;
+  }
+}
+
+@media screen and (max-height: 320px) {
+  .m-signature-pad--body {
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 32px;
+  }
+  .m-signature-pad--footer {
+    left: 20px;
+    right: 20px;
+    bottom: 4px;
+    height: 28px;
+  }
+  .m-signature-pad--footer
+    .description {
+      font-size: 1em;
+      margin-top: 1em;
+    }
+}

public/css/dist/skins/skin-black.css

@@ -1 +1,219 @@
-.skin-black .main-header .navbar{background-color:#111}.skin-black .main-header .navbar .nav>li>a{color:#fff}.skin-black .main-header .navbar .nav .open>a,.skin-black .main-header .navbar .nav .open>a:focus,.skin-black .main-header .navbar .nav .open>a:hover,.skin-black .main-header .navbar .nav>.active>a,.skin-black .main-header .navbar .nav>li>a:active,.skin-black .main-header .navbar .nav>li>a:focus,.skin-black .main-header .navbar .nav>li>a:hover,.skin-black .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-black .main-header .navbar .sidebar-toggle{color:#fff}.skin-black .main-header .navbar .sidebar-toggle:hover{background-color:#040404}@media (max-width:767px){.skin-black .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-black .main-header .navbar .dropdown-menu li a{color:#333}.skin-black .main-header .navbar .dropdown-menu li a:hover{background:#040404}}.skin-black .main-header li.user-header{background-color:#111}.skin-black .content-header{background:transparent}.skin-black .left-side,.skin-black .main-sidebar,.skin-black .wrapper{background-color:#222d32}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#fff}.skin-black .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-black .sidebar-menu>li>a{border-left:3px solid transparent}.skin-black .sidebar-menu>li.active>a,.skin-black .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#111;color:#fff}.skin-black .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-black .sidebar a{color:#b8c7ce}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#8aa4af}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-black .sidebar-form .btn,.skin-black .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-black .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-black .sidebar-form input[type=text]:focus,.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-black.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#000}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#505156;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#111;border-color:#1f1f21;color:#fff}.btn.btn-white:hover,.btn.btn-white:link,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:link,.btn:hover.btn-white:visited{color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#000}:root{--button-default:#000;--button-primary:#000;--button-hover:#000;--header:#111;--text-main:#bbb;--text-sub:#9b9b9b;--link:#black;--visited-link:#111;--hover-link:#999;--nav-link:#fff;--light-link:#fff}.btn-danger.btn-sm.disabled,a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.far fa-life-ring{color:var(--link)}.sidebar-toggle-mobile{color:#fff!important}.skin-black .main-header .navbar .nav>li>a{text-decoration:none}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#111}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Black
+ * ----------
+ */
+.skin-black .main-header .navbar {
+  background-color: #111;
+}
+.skin-black .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black .main-header .navbar .nav > li > a:hover,
+.skin-black .main-header .navbar .nav > li > a:active,
+.skin-black .main-header .navbar .nav > li > a:focus,
+.skin-black .main-header .navbar .nav .open > a,
+.skin-black .main-header .navbar .nav .open > a:hover,
+.skin-black .main-header .navbar .nav .open > a:focus,
+.skin-black .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+  }
+}
+.skin-black .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black .content-header {
+  background: transparent;
+}
+.skin-black .wrapper,
+.skin-black .main-sidebar,
+.skin-black .left-side {
+  background-color: #222d32;
+}
+.skin-black .user-panel > .info,
+.skin-black .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black .sidebar-menu > li:hover > a,
+.skin-black .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black .treeview-menu > li.active > a,
+.skin-black .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black .sidebar-form input[type="text"],
+.skin-black .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black .sidebar-form input[type="text"]:focus,
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #000;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #505156;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #111;
+  border-color: #1f1f21;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  color: #fff;
+}
+.btn.btn-white:visited,
+.btn:hover.btn-white:visited {
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #000000;
+}
+:root {
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #black;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #111;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #999999;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.btn-danger.btn-sm.disabled {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.sidebar-toggle-mobile {
+  color: #FFF !important;
+}
+.skin-black .main-header .navbar .nav > li > a,
+.skin-black .main-header .navbar .nav > li > a {
+  text-decoration: none;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #111;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-black.min.css

@@ -1 +1,219 @@
-.skin-black .main-header .navbar{background-color:#111}.skin-black .main-header .navbar .nav>li>a{color:#fff}.skin-black .main-header .navbar .nav .open>a,.skin-black .main-header .navbar .nav .open>a:focus,.skin-black .main-header .navbar .nav .open>a:hover,.skin-black .main-header .navbar .nav>.active>a,.skin-black .main-header .navbar .nav>li>a:active,.skin-black .main-header .navbar .nav>li>a:focus,.skin-black .main-header .navbar .nav>li>a:hover,.skin-black .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-black .main-header .navbar .sidebar-toggle{color:#fff}.skin-black .main-header .navbar .sidebar-toggle:hover{background-color:#040404}@media (max-width:767px){.skin-black .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-black .main-header .navbar .dropdown-menu li a{color:#333}.skin-black .main-header .navbar .dropdown-menu li a:hover{background:#040404}}.skin-black .main-header li.user-header{background-color:#111}.skin-black .content-header{background:0 0}.skin-black .left-side,.skin-black .main-sidebar,.skin-black .wrapper{background-color:#222d32}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#fff}.skin-black .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-black .sidebar-menu>li>a{border-left:3px solid transparent}.skin-black .sidebar-menu>li.active>a,.skin-black .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#111;color:#fff}.skin-black .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-black .sidebar a{color:#b8c7ce}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#8aa4af}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-black .sidebar-form .btn,.skin-black .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-black .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-black .sidebar-form input[type=text]:focus,.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-black.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#000}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#505156;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#111;border-color:#1f1f21;color:#fff}.btn.btn-white:hover,.btn.btn-white:link,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:link,.btn:hover.btn-white:visited{color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#000}:root{--button-default:#000;--button-primary:#000;--button-hover:#000;--header:#111;--text-main:#bbb;--text-sub:#9b9b9b;--link:#black;--visited-link:#111;--hover-link:#999;--nav-link:#fff;--light-link:#fff}.btn-danger.btn-sm.disabled,a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.far fa-life-ring{color:var(--link)}.sidebar-toggle-mobile{color:#fff!important}.skin-black .main-header .navbar .nav>li>a{text-decoration:none}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#111}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Black
+ * ----------
+ */
+.skin-black .main-header .navbar {
+  background-color: #111;
+}
+.skin-black .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black .main-header .navbar .nav > li > a:hover,
+.skin-black .main-header .navbar .nav > li > a:active,
+.skin-black .main-header .navbar .nav > li > a:focus,
+.skin-black .main-header .navbar .nav .open > a,
+.skin-black .main-header .navbar .nav .open > a:hover,
+.skin-black .main-header .navbar .nav .open > a:focus,
+.skin-black .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+  }
+}
+.skin-black .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black .content-header {
+  background: transparent;
+}
+.skin-black .wrapper,
+.skin-black .main-sidebar,
+.skin-black .left-side {
+  background-color: #222d32;
+}
+.skin-black .user-panel > .info,
+.skin-black .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black .sidebar-menu > li:hover > a,
+.skin-black .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black .treeview-menu > li.active > a,
+.skin-black .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black .sidebar-form input[type="text"],
+.skin-black .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black .sidebar-form input[type="text"]:focus,
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #000;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #505156;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #111;
+  border-color: #1f1f21;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  color: #fff;
+}
+.btn.btn-white:visited,
+.btn:hover.btn-white:visited {
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #000000;
+}
+:root {
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #black;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #111;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #999999;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.btn-danger.btn-sm.disabled {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.sidebar-toggle-mobile {
+  color: #FFF !important;
+}
+.skin-black .main-header .navbar .nav > li > a,
+.skin-black .main-header .navbar .nav > li > a {
+  text-decoration: none;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #111;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-blue.css

@@ -1 +1,239 @@
-.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:focus,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav>.active>a,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#333}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:transparent}.skin-blue .left-side,.skin-blue .main-sidebar,.skin-blue .wrapper{background-color:#222d32}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent}.skin-blue .sidebar-menu>li.active>a,.skin-blue .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#3c8dbc;color:#fff}.skin-blue .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-blue .sidebar-form .btn,.skin-blue .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-blue .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-blue .sidebar-form input[type=text]:focus,.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-blue.layout-top-nav .main-header>.logo .logo-variant{background-color:unset}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary,btn-sm .btn-primary:link,btn-sm.btn-primary{background-color:#307095;border-color:#23536f;color:#fff!important}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover,btn-sma.btn-primary:hover{background-color:#23536f;border-color:#23536f;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link,btn-sm.btn-white:link{background-color:#307095;color:#fff}.btn.btn-white:hover,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:visited,btn-sm.btn-white:hover,btn-sm.btn-white:visited{background-color:#173648;color:#fff}.btn-danger,.btn-danger:link,.btn-danger:visited,.btn-warning,.btn-warning:link,.btn-warning:visited,a.btn-danger:hover,a.btn-warning:hover{color:#fff}.btn-default:link,.btn-default:visited,a.btn-default:hover{color:#505156}:root{--button-default:#505156;--button-primary:#1d455b;--button-hover:#173648;--header:#3c8dbc;--text-main:#bbb;--text-sub:#9b9b9b;--link:#296282;--visited-link:#5fa4cc;--hover-link:#86bad8;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a:hover{color:var(--hover-link)}.text-primary{color:#23536f}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#3c8dbc}.search-highlight,.search-highlight:hover{background-color:#e9d15b}a.settings_button:hover,a.settings_button:link,a.settings_button:visited{color:#3c8dbc}
+/*
+ * Skin: Blue
+ * ----------
+ */
+.skin-blue .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .nav > li > a:hover,
+.skin-blue .main-header .navbar .nav > li > a:active,
+.skin-blue .main-header .navbar .nav > li > a:focus,
+.skin-blue .main-header .navbar .nav .open > a,
+.skin-blue .main-header .navbar .nav .open > a:hover,
+.skin-blue .main-header .navbar .nav .open > a:focus,
+.skin-blue .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.skin-blue .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue .content-header {
+  background: transparent;
+}
+.skin-blue .wrapper,
+.skin-blue .main-sidebar,
+.skin-blue .left-side {
+  background-color: #222d32;
+}
+.skin-blue .user-panel > .info,
+.skin-blue .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue .sidebar-menu > li:hover > a,
+.skin-blue .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue .treeview-menu > li.active > a,
+.skin-blue .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue .sidebar-form input[type="text"],
+.skin-blue .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue .sidebar-form input[type="text"]:focus,
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: unset;
+}
+.btn.btn-primary,
+btn-sm.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+btn-sm .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #23536f;
+  color: #fff !important;
+}
+.btna.btn-primary:hover,
+btn-sma.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+btn-sm.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+btn-sm.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+.btn.btn-white:visited,
+btn-sm.btn-white:visited,
+.btn:hover.btn-white:visited {
+  background-color: #173648;
+  color: #fff;
+}
+.btn-warning,
+.btn-warning:link,
+a.btn-warning:hover,
+.btn-warning:link,
+.btn-warning:visited,
+.btn-danger,
+.btn-danger:link,
+a.btn-danger:hover,
+.btn-danger:link,
+.btn-danger:visited {
+  color: #fff;
+}
+.btn-default:link,
+a.btn-default:hover,
+.btn-default:visited {
+  color: #505156;
+}
+:root {
+  --button-default: #505156;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #296282;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #5fa4cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #86bad8;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.text-primary {
+  color: #23536f;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #3c8dbc;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+a.settings_button:link,
+a.settings_button:visited,
+a.settings_button:hover {
+  color: #3c8dbc;
+}
+

public/css/dist/skins/skin-blue.min.css

@@ -1 +1,239 @@
-.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:focus,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav>.active>a,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#333}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:0 0}.skin-blue .left-side,.skin-blue .main-sidebar,.skin-blue .wrapper{background-color:#222d32}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent}.skin-blue .sidebar-menu>li.active>a,.skin-blue .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#3c8dbc;color:#fff}.skin-blue .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-blue .sidebar-form .btn,.skin-blue .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-blue .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-blue .sidebar-form input[type=text]:focus,.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-blue.layout-top-nav .main-header>.logo .logo-variant{background-color:unset}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary,btn-sm .btn-primary:link,btn-sm.btn-primary{background-color:#307095;border-color:#23536f;color:#fff!important}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover,btn-sma.btn-primary:hover{background-color:#23536f;border-color:#23536f;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link,btn-sm.btn-white:link{background-color:#307095;color:#fff}.btn.btn-white:hover,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:visited,btn-sm.btn-white:hover,btn-sm.btn-white:visited{background-color:#173648;color:#fff}.btn-danger,.btn-danger:link,.btn-danger:visited,.btn-warning,.btn-warning:link,.btn-warning:visited,a.btn-danger:hover,a.btn-warning:hover{color:#fff}.btn-default:link,.btn-default:visited,a.btn-default:hover{color:#505156}:root{--button-default:#505156;--button-primary:#1d455b;--button-hover:#173648;--header:#3c8dbc;--text-main:#bbb;--text-sub:#9b9b9b;--link:#296282;--visited-link:#5fa4cc;--hover-link:#86bad8;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a:hover{color:var(--hover-link)}.text-primary{color:#23536f}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#3c8dbc}.search-highlight,.search-highlight:hover{background-color:#e9d15b}a.settings_button:hover,a.settings_button:link,a.settings_button:visited{color:#3c8dbc}
+/*
+ * Skin: Blue
+ * ----------
+ */
+.skin-blue .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .nav > li > a:hover,
+.skin-blue .main-header .navbar .nav > li > a:active,
+.skin-blue .main-header .navbar .nav > li > a:focus,
+.skin-blue .main-header .navbar .nav .open > a,
+.skin-blue .main-header .navbar .nav .open > a:hover,
+.skin-blue .main-header .navbar .nav .open > a:focus,
+.skin-blue .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.skin-blue .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue .content-header {
+  background: transparent;
+}
+.skin-blue .wrapper,
+.skin-blue .main-sidebar,
+.skin-blue .left-side {
+  background-color: #222d32;
+}
+.skin-blue .user-panel > .info,
+.skin-blue .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue .sidebar-menu > li:hover > a,
+.skin-blue .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue .treeview-menu > li.active > a,
+.skin-blue .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue .sidebar-form input[type="text"],
+.skin-blue .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue .sidebar-form input[type="text"]:focus,
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: unset;
+}
+.btn.btn-primary,
+btn-sm.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+btn-sm .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #23536f;
+  color: #fff !important;
+}
+.btna.btn-primary:hover,
+btn-sma.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+btn-sm.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+btn-sm.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+.btn.btn-white:visited,
+btn-sm.btn-white:visited,
+.btn:hover.btn-white:visited {
+  background-color: #173648;
+  color: #fff;
+}
+.btn-warning,
+.btn-warning:link,
+a.btn-warning:hover,
+.btn-warning:link,
+.btn-warning:visited,
+.btn-danger,
+.btn-danger:link,
+a.btn-danger:hover,
+.btn-danger:link,
+.btn-danger:visited {
+  color: #fff;
+}
+.btn-default:link,
+a.btn-default:hover,
+.btn-default:visited {
+  color: #505156;
+}
+:root {
+  --button-default: #505156;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #296282;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #5fa4cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #86bad8;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.text-primary {
+  color: #23536f;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #3c8dbc;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+a.settings_button:link,
+a.settings_button:visited,
+a.settings_button:hover {
+  color: #3c8dbc;
+}
+

public/css/dist/skins/skin-contrast.css

@@ -1 +1,227 @@
-.skin-contrast .main-header .navbar{background-color:#001f3f}.skin-contrast .main-header .navbar .nav>li>a{color:#fff}.skin-contrast .main-header .navbar .nav .open>a,.skin-contrast .main-header .navbar .nav .open>a:focus,.skin-contrast .main-header .navbar .nav .open>a:hover,.skin-contrast .main-header .navbar .nav>.active>a,.skin-contrast .main-header .navbar .nav>li>a:active,.skin-contrast .main-header .navbar .nav>li>a:focus,.skin-contrast .main-header .navbar .nav>li>a:hover,.skin-contrast .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-contrast .main-header .navbar .sidebar-toggle{color:#fff}.skin-contrast .main-header .navbar .sidebar-toggle:hover{background-color:#001226}@media (max-width:767px){.skin-contrast .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-contrast .main-header .navbar .dropdown-menu li a{color:#fff}.skin-contrast .main-header .navbar .dropdown-menu li a:hover{background:#001226}}.skin-contrast .main-header li.user-header{background-color:#001f3f}.skin-contrast .content-header{background:transparent}.skin-contrast .left-side,.skin-contrast .main-sidebar,.skin-contrast .wrapper{background-color:#222d32}.skin-contrast .user-panel>.info,.skin-contrast .user-panel>.info>a{color:#fff}.skin-contrast .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-contrast .sidebar-menu>li>a{border-left:3px solid transparent}.skin-contrast .sidebar-menu>li.active>a,.skin-contrast .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-contrast .sidebar a{color:#b8c7ce}.skin-contrast .sidebar a:hover{text-decoration:none}.skin-contrast .treeview-menu>li>a{color:#8aa4af}.skin-contrast .treeview-menu>li.active>a,.skin-contrast .treeview-menu>li>a:hover{color:#fff}.skin-contrast .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-contrast .sidebar-form input[type=text]:focus,.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-contrast .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00060c;border-color:#000;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#000;border-color:#000;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00060c;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000;color:#fff}a.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,a:hover{color:#001f3f}a:hover{text-decoration:underline}a:visited{color:#001f3f}a.btn:hover{color:#fff;text-decoration:underline}.text-primary{color:#000}.skin-contrast .treeview-menu>li>a{color:#fff}.bg-teal{background-color:#1b6a6a!important}.bg-orange{background-color:#995400!important}.bg-purple{background-color:#3a3767!important}.bg-maroon{background-color:#7d1038!important}.pagination>li>a{color:#00060c!important}.pagination>.active>a{background-color:#001f3f;color:#fff!important}btn-success{background-color:#000d07}input::-webkit-input-placeholder{color:#b5bbc8!important}input::-moz-placeholder{color:#b5bbc8!important}input::-ms-input-placeholder{color:#b5bbc8!important}.select2-default,.select2-selection__placeholder{color:#37383c!important}.callout.callout-info{background-color:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Contrast
+ * ----------
+ */
+.skin-contrast .main-header .navbar {
+  background-color: #001F3F;
+}
+.skin-contrast .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .nav > li > a:hover,
+.skin-contrast .main-header .navbar .nav > li > a:active,
+.skin-contrast .main-header .navbar .nav > li > a:focus,
+.skin-contrast .main-header .navbar .nav .open > a,
+.skin-contrast .main-header .navbar .nav .open > a:hover,
+.skin-contrast .main-header .navbar .nav .open > a:focus,
+.skin-contrast .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  background-color: #001226;
+}
+@media (max-width: 767px) {
+  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
+    background: #001226;
+  }
+}
+.skin-contrast .main-header li.user-header {
+  background-color: #001F3F;
+}
+.skin-contrast .content-header {
+  background: transparent;
+}
+.skin-contrast .wrapper,
+.skin-contrast .main-sidebar,
+.skin-contrast .left-side {
+  background-color: #222d32;
+}
+.skin-contrast .user-panel > .info,
+.skin-contrast .user-panel > .info > a {
+  color: #fff;
+}
+.skin-contrast .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-contrast .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-contrast .sidebar-menu > li:hover > a,
+.skin-contrast .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #001F3F;
+}
+.skin-contrast .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-contrast .sidebar a {
+  color: #b8c7ce;
+}
+.skin-contrast .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-contrast .treeview-menu > li.active > a,
+.skin-contrast .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-contrast .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-contrast .sidebar-form input[type="text"],
+.skin-contrast .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-contrast .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus,
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-contrast .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00060c;
+  border-color: #000000;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00060c;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+a.btn.btn-link.text-left {
+  color: #001F3F;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover {
+  color: #001F3F;
+}
+a {
+  color: #001F3F;
+}
+a:hover {
+  color: #001F3F;
+  text-decoration: underline;
+}
+a:visited {
+  color: #001F3F;
+}
+a.btn:hover {
+  color: #fff;
+  text-decoration: underline;
+}
+.text-primary {
+  color: #000000;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #FFF;
+}
+.bg-teal {
+  background-color: #1b6a6a !important;
+}
+.bg-orange {
+  background-color: #995400 !important;
+}
+.bg-purple {
+  background-color: #3a3767 !important;
+}
+.bg-maroon {
+  background-color: #7d1038 !important;
+}
+.pagination > li > a {
+  color: #00060c !important;
+}
+.pagination > .active > a {
+  background-color: #001F3F;
+  color: #FFF !important;
+}
+btn-success {
+  background-color: #000d07;
+}
+input::-webkit-input-placeholder {
+  /* Chrome/Opera/Safari */
+  color: #b5bbc8 !important;
+}
+input::-moz-placeholder {
+  /* Firefox 19+ */
+  color: #b5bbc8 !important;
+}
+input::-ms-input-placeholder {
+  /* IE 10+ */
+  color: #b5bbc8 !important;
+}
+.select2-default,
+.select2-selection__placeholder {
+  color: #37383c !important;
+}
+.callout.callout-info {
+  background-color: #23536f !important;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-contrast.min.css

@@ -1 +1,227 @@
-.skin-contrast .main-header .navbar{background-color:#001f3f}.skin-contrast .main-header .navbar .nav>li>a{color:#fff}.skin-contrast .main-header .navbar .nav .open>a,.skin-contrast .main-header .navbar .nav .open>a:focus,.skin-contrast .main-header .navbar .nav .open>a:hover,.skin-contrast .main-header .navbar .nav>.active>a,.skin-contrast .main-header .navbar .nav>li>a:active,.skin-contrast .main-header .navbar .nav>li>a:focus,.skin-contrast .main-header .navbar .nav>li>a:hover,.skin-contrast .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-contrast .main-header .navbar .sidebar-toggle{color:#fff}.skin-contrast .main-header .navbar .sidebar-toggle:hover{background-color:#001226}@media (max-width:767px){.skin-contrast .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-contrast .main-header .navbar .dropdown-menu li a{color:#fff}.skin-contrast .main-header .navbar .dropdown-menu li a:hover{background:#001226}}.skin-contrast .main-header li.user-header{background-color:#001f3f}.skin-contrast .content-header{background:0 0}.skin-contrast .left-side,.skin-contrast .main-sidebar,.skin-contrast .wrapper{background-color:#222d32}.skin-contrast .user-panel>.info,.skin-contrast .user-panel>.info>a{color:#fff}.skin-contrast .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-contrast .sidebar-menu>li>a{border-left:3px solid transparent}.skin-contrast .sidebar-menu>li.active>a,.skin-contrast .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-contrast .sidebar a{color:#b8c7ce}.skin-contrast .sidebar a:hover{text-decoration:none}.skin-contrast .treeview-menu>li>a{color:#8aa4af}.skin-contrast .treeview-menu>li.active>a,.skin-contrast .treeview-menu>li>a:hover{color:#fff}.skin-contrast .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-contrast .sidebar-form input[type=text]:focus,.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-contrast .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00060c;border-color:#000;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#000;border-color:#000;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00060c;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000;color:#fff}a.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,a:hover{color:#001f3f}a:hover{text-decoration:underline}a:visited{color:#001f3f}a.btn:hover{color:#fff;text-decoration:underline}.text-primary{color:#000}.skin-contrast .treeview-menu>li>a{color:#fff}.bg-teal{background-color:#1b6a6a!important}.bg-orange{background-color:#995400!important}.bg-purple{background-color:#3a3767!important}.bg-maroon{background-color:#7d1038!important}.pagination>li>a{color:#00060c!important}.pagination>.active>a{background-color:#001f3f;color:#fff!important}btn-success{background-color:#000d07}input::-webkit-input-placeholder{color:#b5bbc8!important}input::-moz-placeholder{color:#b5bbc8!important}input::-ms-input-placeholder{color:#b5bbc8!important}.select2-default,.select2-selection__placeholder{color:#37383c!important}.callout.callout-info{background-color:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Contrast
+ * ----------
+ */
+.skin-contrast .main-header .navbar {
+  background-color: #001F3F;
+}
+.skin-contrast .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .nav > li > a:hover,
+.skin-contrast .main-header .navbar .nav > li > a:active,
+.skin-contrast .main-header .navbar .nav > li > a:focus,
+.skin-contrast .main-header .navbar .nav .open > a,
+.skin-contrast .main-header .navbar .nav .open > a:hover,
+.skin-contrast .main-header .navbar .nav .open > a:focus,
+.skin-contrast .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  background-color: #001226;
+}
+@media (max-width: 767px) {
+  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
+    background: #001226;
+  }
+}
+.skin-contrast .main-header li.user-header {
+  background-color: #001F3F;
+}
+.skin-contrast .content-header {
+  background: transparent;
+}
+.skin-contrast .wrapper,
+.skin-contrast .main-sidebar,
+.skin-contrast .left-side {
+  background-color: #222d32;
+}
+.skin-contrast .user-panel > .info,
+.skin-contrast .user-panel > .info > a {
+  color: #fff;
+}
+.skin-contrast .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-contrast .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-contrast .sidebar-menu > li:hover > a,
+.skin-contrast .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #001F3F;
+}
+.skin-contrast .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-contrast .sidebar a {
+  color: #b8c7ce;
+}
+.skin-contrast .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-contrast .treeview-menu > li.active > a,
+.skin-contrast .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-contrast .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-contrast .sidebar-form input[type="text"],
+.skin-contrast .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-contrast .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus,
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-contrast .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00060c;
+  border-color: #000000;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00060c;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+a.btn.btn-link.text-left {
+  color: #001F3F;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover {
+  color: #001F3F;
+}
+a {
+  color: #001F3F;
+}
+a:hover {
+  color: #001F3F;
+  text-decoration: underline;
+}
+a:visited {
+  color: #001F3F;
+}
+a.btn:hover {
+  color: #fff;
+  text-decoration: underline;
+}
+.text-primary {
+  color: #000000;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #FFF;
+}
+.bg-teal {
+  background-color: #1b6a6a !important;
+}
+.bg-orange {
+  background-color: #995400 !important;
+}
+.bg-purple {
+  background-color: #3a3767 !important;
+}
+.bg-maroon {
+  background-color: #7d1038 !important;
+}
+.pagination > li > a {
+  color: #00060c !important;
+}
+.pagination > .active > a {
+  background-color: #001F3F;
+  color: #FFF !important;
+}
+btn-success {
+  background-color: #000d07;
+}
+input::-webkit-input-placeholder {
+  /* Chrome/Opera/Safari */
+  color: #b5bbc8 !important;
+}
+input::-moz-placeholder {
+  /* Firefox 19+ */
+  color: #b5bbc8 !important;
+}
+input::-ms-input-placeholder {
+  /* IE 10+ */
+  color: #b5bbc8 !important;
+}
+.select2-default,
+.select2-selection__placeholder {
+  color: #37383c !important;
+}
+.callout.callout-info {
+  background-color: #23536f !important;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-green.css

@@ -1 +1,211 @@
-:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#005a31;--button-primary:#002715;--button-hover:#000d07;--header:#00a65a;--text-main:#bbb;--text-sub:#9b9b9b;--link:#00a65a;--visited-link:#00f383;--hover-link:#0dff90}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:focus,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav>.active>a,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#333}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .left-side,.skin-green .main-sidebar,.skin-green .wrapper{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li.active>a,.skin-green .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#00a65a;color:#fff}.skin-green .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-green .sidebar-form .btn,.skin-green .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-green .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-green .sidebar-form input[type=text]:focus,.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-green.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00733e;border-color:#004023;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#004023;border-color:#004023;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00733e;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000d07;color:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a{color:#00a65a}a:hover{color:#004023}a:visited{color:#00a65a}.text-primary{color:#004023}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#00a65a}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Green
+ * ----------
+ */
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
+  --header: #00a65a;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00a65a;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #00f383;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #0dff90;
+}
+.skin-green .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green .main-header .navbar .nav > li > a:hover,
+.skin-green .main-header .navbar .nav > li > a:active,
+.skin-green .main-header .navbar .nav > li > a:focus,
+.skin-green .main-header .navbar .nav .open > a,
+.skin-green .main-header .navbar .nav .open > a:hover,
+.skin-green .main-header .navbar .nav .open > a:focus,
+.skin-green .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+  }
+}
+.skin-green .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green .content-header {
+  background: transparent;
+}
+.skin-green .wrapper,
+.skin-green .main-sidebar,
+.skin-green .left-side {
+  background-color: #222d32;
+}
+.skin-green .user-panel > .info,
+.skin-green .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green .sidebar-menu > li:hover > a,
+.skin-green .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green .treeview-menu > li.active > a,
+.skin-green .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green .sidebar-form input[type="text"],
+.skin-green .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green .sidebar-form input[type="text"]:focus,
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #004023;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #fff;
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a {
+  color: #00a65a;
+}
+a:hover {
+  color: #004023;
+}
+a:visited {
+  color: #00a65a;
+}
+.text-primary {
+  color: #004023;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #00a65a;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-green.min.css

@@ -1 +1,211 @@
-:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#005a31;--button-primary:#002715;--button-hover:#000d07;--header:#00a65a;--text-main:#bbb;--text-sub:#9b9b9b;--link:#00a65a;--visited-link:#00f383;--hover-link:#0dff90}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:focus,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav>.active>a,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#333}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:0 0}.skin-green .left-side,.skin-green .main-sidebar,.skin-green .wrapper{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li.active>a,.skin-green .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#00a65a;color:#fff}.skin-green .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-green .sidebar-form .btn,.skin-green .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-green .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-green .sidebar-form input[type=text]:focus,.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-green.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00733e;border-color:#004023;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#004023;border-color:#004023;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00733e;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000d07;color:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a{color:#00a65a}a:hover{color:#004023}a:visited{color:#00a65a}.text-primary{color:#004023}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#00a65a}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Green
+ * ----------
+ */
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
+  --header: #00a65a;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00a65a;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #00f383;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #0dff90;
+}
+.skin-green .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green .main-header .navbar .nav > li > a:hover,
+.skin-green .main-header .navbar .nav > li > a:active,
+.skin-green .main-header .navbar .nav > li > a:focus,
+.skin-green .main-header .navbar .nav .open > a,
+.skin-green .main-header .navbar .nav .open > a:hover,
+.skin-green .main-header .navbar .nav .open > a:focus,
+.skin-green .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+  }
+}
+.skin-green .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green .content-header {
+  background: transparent;
+}
+.skin-green .wrapper,
+.skin-green .main-sidebar,
+.skin-green .left-side {
+  background-color: #222d32;
+}
+.skin-green .user-panel > .info,
+.skin-green .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green .sidebar-menu > li:hover > a,
+.skin-green .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green .treeview-menu > li.active > a,
+.skin-green .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green .sidebar-form input[type="text"],
+.skin-green .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green .sidebar-form input[type="text"]:focus,
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #004023;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #fff;
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a {
+  color: #00a65a;
+}
+a:hover {
+  color: #004023;
+}
+a:visited {
+  color: #00a65a;
+}
+.text-primary {
+  color: #004023;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #00a65a;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-orange.css

@@ -1 +1,206 @@
-.skin-orange .main-header .navbar{background-color:#ff8c00}.skin-orange .main-header .navbar .nav>li>a{color:#fff}.skin-orange .main-header .navbar .nav .open>a,.skin-orange .main-header .navbar .nav .open>a:focus,.skin-orange .main-header .navbar .nav .open>a:hover,.skin-orange .main-header .navbar .nav>.active>a,.skin-orange .main-header .navbar .nav>li>a:active,.skin-orange .main-header .navbar .nav>li>a:focus,.skin-orange .main-header .navbar .nav>li>a:hover,.skin-orange .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-orange .main-header .navbar .sidebar-toggle{color:#fff}.skin-orange .main-header .navbar .sidebar-toggle:hover{background-color:#e67e00}@media (max-width:767px){.skin-orange .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-orange .main-header .navbar .dropdown-menu li a{color:#333}.skin-orange .main-header .navbar .dropdown-menu li a:hover{background:#e67e00}}.skin-orange .main-header li.user-header{background-color:#ff8c00}.skin-orange .content-header{background:transparent}.skin-orange .left-side,.skin-orange .main-sidebar,.skin-orange .wrapper{background-color:#222d32}.skin-orange .user-panel>.info,.skin-orange .user-panel>.info>a{color:#fff}.skin-orange .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-orange .sidebar-menu>li>a{border-left:3px solid transparent}.skin-orange .sidebar-menu>li.active>a,.skin-orange .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#ff8c00;color:#fff}.skin-orange .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-orange .sidebar a{color:#b8c7ce}.skin-orange .sidebar a:hover{text-decoration:none}.skin-orange .treeview-menu>li>a{color:#8aa4af}.skin-orange .treeview-menu>li.active>a,.skin-orange .treeview-menu>li>a:hover{color:#fff}.skin-orange .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-orange .sidebar-form .btn,.skin-orange .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-orange .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-orange .sidebar-form input[type=text]:focus,.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-orange .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-orange.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#cc7000;border-color:#995400;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#995400;border-color:#995400;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#cc7000;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#663800;color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#995400}:root{--button-default:#b36200;--button-primary:#804600;--button-hover:#663800;--header:#ff8c00;--text-main:#bbb;--text-sub:#9b9b9b;--link:#ff8c00;--visited-link:#ffa333;--hover-link:#ffaf4d;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#ff8c00}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Orange
+ * ----------
+ */
+.skin-orange .main-header .navbar {
+  background-color: #FF8C00;
+}
+.skin-orange .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .nav > li > a:hover,
+.skin-orange .main-header .navbar .nav > li > a:active,
+.skin-orange .main-header .navbar .nav > li > a:focus,
+.skin-orange .main-header .navbar .nav .open > a,
+.skin-orange .main-header .navbar .nav .open > a:hover,
+.skin-orange .main-header .navbar .nav .open > a:focus,
+.skin-orange .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  background-color: #e67e00;
+}
+@media (max-width: 767px) {
+  .skin-orange .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a:hover {
+    background: #e67e00;
+  }
+}
+.skin-orange .main-header li.user-header {
+  background-color: #FF8C00;
+}
+.skin-orange .content-header {
+  background: transparent;
+}
+.skin-orange .wrapper,
+.skin-orange .main-sidebar,
+.skin-orange .left-side {
+  background-color: #222d32;
+}
+.skin-orange .user-panel > .info,
+.skin-orange .user-panel > .info > a {
+  color: #fff;
+}
+.skin-orange .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-orange .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-orange .sidebar-menu > li:hover > a,
+.skin-orange .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FF8C00;
+}
+.skin-orange .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-orange .sidebar a {
+  color: #b8c7ce;
+}
+.skin-orange .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-orange .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-orange .treeview-menu > li.active > a,
+.skin-orange .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-orange .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-orange .sidebar-form input[type="text"],
+.skin-orange .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-orange .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-orange .sidebar-form input[type="text"]:focus,
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-orange .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-orange.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #cc7000;
+  border-color: #995400;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #995400;
+  border-color: #995400;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #cc7000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #663800;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #995400;
+}
+:root {
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
+  --header: #FF8C00;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #FF8C00;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffa333;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffaf4d;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #FF8C00;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+