Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

Author: snipe

app/Console/Commands/TestLocationsFMCS.php

@@ -27,7 +27,7 @@ class TestLocationsFMCS extends Command
     public function handle()
     {
         $this->info('This script checks for company ID inconsistencies if Full Multiple Company Support with scoped locations will be used.');
-        $this->info('This could take few moments if have a very large dataset.');
+        $this->info('This could take a few moments if have a very large dataset.');
         $this->newLine();
 
         // if parameter location_id is set, only test this location

app/Http/Controllers/SettingsController.php

@@ -290,8 +290,8 @@ public function index() : View
     public function getSettings() : View
     {
         $setting = Setting::getSettings();
-
-        return view('settings/general', compact('setting'));
+        $total_locations = count(Helper::test_locations_fmcs(false));
+        return view('settings/general', compact('setting'))->with('total_locations', $total_locations);
     }
 
     /**

public/css/build/app.css

@@ -2,8 +2,8 @@
     "/js/build/app.js": "/js/build/app.js?id=f69d05a80165b5bbf6b0f4691edfd24e",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=d34ae2483cbe2c77478c45f4006eba55",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=6bf62cdec2477f3176df196fd0c99662",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=fcf94ab9bcac240ccc403f10e0c04d42",
-    "/css/build/app.css": "/css/build/app.css?id=c7f113795ddc22294edd5b04243adcf0",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=569dc248b0dc3dbb01610b034300f2f2",
+    "/css/build/app.css": "/css/build/app.css?id=ed8cabf3efad21ed89d18d6582d2885f",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=a67bd93bed52e6a29967fe472de66d6c",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=53edc92eb2d272744bc7404ec259930e",
@@ -19,7 +19,7 @@
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=091d9625203be910caca3e229afe438f",
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=18787b3f00a3be7be38ee4e26cbd2a07",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
-    "/css/dist/all.css": "/css/dist/all.css?id=a943cce39a70d6fbe8722ecf501780ae",
+    "/css/dist/all.css": "/css/dist/all.css?id=2b91d3aa2262b202a452de9cc7f1ab9b",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

public/css/build/overrides.css

@@ -1187,3 +1187,21 @@ code.single-line {
 p.monospace, span.monospace {
   font-family: monospace, monospace;
 }
+
+legend.highlight {
+  background: repeating-linear-gradient(
+          45deg,
+          #222d32,
+          #222d32 10px,
+          #444 10px,
+          #444 11px
+  );
+
+  color: #fff;
+  font-size: 18px;
+  padding: 6px;
+}
+
+fieldset.bottom-padded {
+  padding-bottom: 20px;
+}

public/css/dist/all.css

@@ -151,7 +151,8 @@
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
     'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
-    'scope_locations_fmcs_support_help_text'  => 'In previous versions, locations were not restricted to a particular company. If this setting is disabled, this preserves backward compatibility with older versions and locations can be used across multiple companies. If this setting is enabled, locations are restricted to their selected company.',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
@@ -451,6 +452,19 @@
     ],
 
 
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+
+    ],
+
 
     /* Keywords for settings overview help */
     'keywords' => [

public/mix-manifest.json

@@ -147,7 +147,7 @@
                     if (data.status == 'success') {
                         $('#checkedin tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.payload.model + "</td><td>" + data.payload.model_number + "</td><td>" + data.messages + "</td><td><i class='fas fa-check text-success'></i></td></tr>");
 
-                        @if ($user->enable_sounds)
+                        @if ($user?->enable_sounds)
                         var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3');
                         audio.play()
                         @endif
@@ -172,7 +172,7 @@
 
         function handlecheckinFail (data) {
 
-            @if ($user->enable_sounds)
+            @if ($user?->enable_sounds)
             var audio = new Audio('{{ config('app.url') }}/sounds/error.mp3');
             audio.play()
             @endif