Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Users/BulkUsersController.php

@@ -323,7 +323,7 @@ protected function logItemCheckinAndDelete($items, $itemType)
             $logAction->item_type = $itemType;
             $logAction->target_id = $item->assigned_to;
             $logAction->target_type = User::class;
-            $logAction->created_at = auth()->id();
+            $logAction->created_by = auth()->id();
             $logAction->note = 'Bulk checkin items';
             $logAction->logaction('checkin from');
         }

database/migrations/2023_08_01_174150_change_webhook_settings_variable_type.php

@@ -26,7 +26,7 @@ public function up()
     public function down()
     {
         Schema::table('settings', function (Blueprint $table) {
-            $table->varchar('webhook_endpoint')->change();
+            $table->string('webhook_endpoint')->change();
         });
 
     }

database/migrations/2024_09_17_204302_change_user_id_to_created_by.php

@@ -42,7 +42,7 @@ public function down(): void
         }
 
         foreach ($this->existing_table_list() as $table) {
-            if (Schema::hasColumn($table, 'user_id')) {
+            if (Schema::hasColumn($table, 'created_by')) {
                 Schema::table($table, function (Blueprint $table) {
                     $table->renameColumn('created_by', 'user_id');
                 });

resources/views/hardware/bulk-delete.blade.php

@@ -43,14 +43,14 @@
                 <td>{{ $asset->present()->name() }}</td>
                 <td>
                   @if ($asset->location)
-                  {{ $asset->location->name }}
+                  {{ $asset->location->present()->name() }}
+                  @elseif($asset->rtd_location)
+                  {{ $asset->defaultLoc->present()->name() }}
                   @endif
                 </td>
                 <td>
-
-                  {{ $asset->assigned_to }}
-                  @if ($asset->assignedTo)
-                  {{ $asset->assignedTo->present()->name()}}
+                  @if ($asset->assigned_to)
+                    {{ $asset->assigned->present()->name() }}
                   @endif
                 </td>
               </tr>