Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json

Author: snipe

composer.lock

@@ -0,0 +1,34 @@
+<?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_06_211457_add_manager_indexes_to_location_and_user.php

@@ -35,7 +35,7 @@
         "bootstrap-colorpicker": "^2.5.3",
         "bootstrap-datepicker": "^1.10.0",
         "bootstrap-less": "^3.3.8",
-        "bootstrap-table": "1.23.2",
+        "bootstrap-table": "1.23.5",
         "canvas-confetti": "^1.9.3",
         "chart.js": "^2.9.4",
         "clipboard": "^2.0.11",